diff --git a/frontend/src/_stores/dataQueriesStore.js b/frontend/src/_stores/dataQueriesStore.js
index d4c6d6805c..538109c5da 100644
--- a/frontend/src/_stores/dataQueriesStore.js
+++ b/frontend/src/_stores/dataQueriesStore.js
@@ -250,7 +250,9 @@ export function createDataQueriesStore(moduleName) {
                 actions.setSelectedQuery(null);
                 toast.error(`Failed to create query: ${error.message}`);
               })
-              .finally(() => useAppDataStore.getState().actions.setIsSaving(false));
+              .finally(() =>
+                useSuperStore.getState().modules[get().moduleName].useAppDataStore.getState().actions.setIsSaving(false)
+              );
           },
           renameQuery: (id, newName) => {
             /** If query creation in progress, skips call and pushes the update to queue */