diff --git a/src/containers/Tenants/Tenants.tsx b/src/containers/Tenants/Tenants.tsx
index 782830c622..ca59294c01 100644
--- a/src/containers/Tenants/Tenants.tsx
+++ b/src/containers/Tenants/Tenants.tsx
@@ -87,7 +87,9 @@ export const Tenants = ({additionalTenantsProps}: TenantsProps) => {
     };
 
     const renderCreateDBButton = () => {
-        if (isCreateDBAvailable && clusterName) {
+        const buttonAvailable = isCreateDBAvailable && clusterName;
+
+        if (buttonAvailable && !loading) {
             return (
                 <Button
                     view="action"