diff --git a/client/src/pages/dialogs/CreateDatabaseDialog.tsx b/client/src/pages/dialogs/CreateDatabaseDialog.tsx
index ff4a56c2..f4e36467 100644
--- a/client/src/pages/dialogs/CreateDatabaseDialog.tsx
+++ b/client/src/pages/dialogs/CreateDatabaseDialog.tsx
@@ -72,7 +72,9 @@ const CreateDatabaseDialog: FC<CreateDatabaseProps> = ({ onCreate }) => {
 
   const handleCreate = async () => {
     setLoading(true);
-    await createDatabase(form);
+    await createDatabase(form).finally(() => {
+      setLoading(false);
+    });
     openSnackBar(successTrans('create', { name: dbTrans('database') }));
     setLoading(false);