diff --git a/frontend/src/Editor/Editor.jsx b/frontend/src/Editor/Editor.jsx
index e698dbf615..efa476d1e6 100644
--- a/frontend/src/Editor/Editor.jsx
+++ b/frontend/src/Editor/Editor.jsx
@@ -527,7 +527,6 @@ const EditorComponent = (props) => {
     props.setEditorOrViewer('editor');
     await runForInitialLoad();
     await fetchOrgEnvironmentVariables();
-    await fetchOrgEnvironmentConstants();
     initComponentVersioning();
     initRealtimeSave();
     initEventListeners();
@@ -750,7 +749,7 @@ const EditorComponent = (props) => {
     setWindowTitle({ page: pageTitles.EDITOR, appName });
     useAppVersionStore.getState().actions.updateEditingVersion(editing_version);
     current_version_id && useAppVersionStore.getState().actions.updateReleasedVersionId(current_version_id);
-
+    await fetchOrgEnvironmentConstants();
     updateState({
       slug,
       isMaintenanceOn,
diff --git a/frontend/src/_stores/resolverStore.js b/frontend/src/_stores/resolverStore.js
index 1d439c470d..14f84c615e 100644
--- a/frontend/src/_stores/resolverStore.js
+++ b/frontend/src/_stores/resolverStore.js
@@ -98,8 +98,22 @@ export const useResolveStore = create(
 
         const { suggestionList, hintsMap, resolvedRefs } = createReferencesLookup(partialRefState);
 
-        const lookupHintsMap = new Map([...get().lookupTable.hints]);
-        const lookupResolvedRefs = new Map([...get().lookupTable.resolvedRefs]);
+        const _hintsMap = get().lookupTable.hints;
+        const resolvedRefsMap = get().lookupTable.resolvedRefs;
+
+        let lookupHintsMap, lookupResolvedRefs;
+
+        if (_hintsMap.size > 0) {
+          lookupHintsMap = new Map([..._hintsMap]);
+        } else {
+          lookupHintsMap = new Map();
+        }
+
+        if (resolvedRefsMap.size > 0) {
+          lookupResolvedRefs = new Map([...resolvedRefsMap]);
+        } else {
+          lookupResolvedRefs = new Map();
+        }
 
         const newUpdatedrefs = [];