diff --git a/frontend/src/_stores/currentStateStore.js b/frontend/src/_stores/currentStateStore.js
index 5610725915..63eca0998b 100644
--- a/frontend/src/_stores/currentStateStore.js
+++ b/frontend/src/_stores/currentStateStore.js
@@ -106,16 +106,19 @@ useCurrentStateStore.subscribe((state) => {
 
     handleLowPriorityWork(
       () => {
-        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,
-        });
+        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,
+          },
+          true
+        );
       },
       null,
       isPageSwitched
diff --git a/frontend/src/_stores/resolverStore.js b/frontend/src/_stores/resolverStore.js
index 596cda2f0c..6ae644f9d8 100644
--- a/frontend/src/_stores/resolverStore.js
+++ b/frontend/src/_stores/resolverStore.js
@@ -102,10 +102,10 @@ export const useResolveStore = create(
       updateLastUpdatedRefs: (updatedRefs) => {
         set(() => ({ lastUpdatedRefs: updatedRefs }));
       },
-      addAppSuggestions: (partialRefState) => {
+      addAppSuggestions: (partialRefState, intialLoad = false) => {
         if (Object.keys(partialRefState).length === 0) return;
 
-        const { suggestionList, hintsMap, resolvedRefs } = createReferencesLookup(partialRefState);
+        const { suggestionList, hintsMap, resolvedRefs } = createReferencesLookup(partialRefState, false, intialLoad);
 
         const _hintsMap = get().lookupTable.hints;
         const resolvedRefsMap = get().lookupTable.resolvedRefs;