diff --git a/src/router/hooks.js b/src/router/hooks.js
index e5d5288a906..add773e7fcf 100644
--- a/src/router/hooks.js
+++ b/src/router/hooks.js
@@ -38,9 +38,11 @@ export async function navigationGuard(to, from, next, Router, state) {
     next();
 }
 
-export async function stateQueryGuard(next) {
-    const stateQuery = useStateQueryStore();
-    await waitUntilFalse(stateQuery.isLoading());
+export async function stateQueryGuard(to, from, next) {
+    if (to.name !== from.name) {
+        const stateQuery = useStateQueryStore();
+        await waitUntilFalse(stateQuery.isLoading());
+    }
 
     next();
 }
@@ -82,6 +84,7 @@ function waitUntilFalse(ref) {
         const stop = watch(
             ref,
             (val) => {
+                console.log('val: ', val);
                 if (!val) {
                     stop();
                     resolve();
diff --git a/src/router/index.js b/src/router/index.js
index b90f33e74dc..f8659308ae6 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -23,7 +23,7 @@ export { Router };
 export default defineRouter(() => {
     const state = useState();
     Router.beforeEach((to, from, next) => navigationGuard(to, from, next, Router, state));
-    Router.beforeEach((to, from, next) => stateQueryGuard(next));
+    Router.beforeEach((to, from, next) => stateQueryGuard(to, from, next));
     Router.afterEach((to) => setPageTitle(to));
 
     Router.onError(({ message }) => {