diff --git a/frontend/src/_stores/currentStateStore.js b/frontend/src/_stores/currentStateStore.js
index 63eca0998b..96b24dec83 100644
--- a/frontend/src/_stores/currentStateStore.js
+++ b/frontend/src/_stores/currentStateStore.js
@@ -106,16 +106,18 @@ useCurrentStateStore.subscribe((state) => {
 
     handleLowPriorityWork(
       () => {
+        const currentState = useCurrentStateStore.getState();
         useResolveStore.getState().actions.addAppSuggestions(
           {
-            queries: state.queries,
-            components: !isPageSwitched ? state.components : {},
-            globals: state.globals,
-            page: state.page,
-            variables: state.variables,
-            client: state.client,
-            server: state.server,
-            constants: state.constants,
+            // get state directly to prevent consuming stale data
+            queries: currentState.queries,
+            components: !isPageSwitched ? currentState.components : {},
+            globals: currentState.globals,
+            page: currentState.page,
+            variables: currentState.variables,
+            client: currentState.client,
+            server: currentState.server,
+            constants: currentState.constants,
           },
           true
         );