diff --git a/app/client/src/ce/entities/DataTree/types.ts b/app/client/src/ce/entities/DataTree/types.ts
index fe5489737776..0c1818d7a502 100644
--- a/app/client/src/ce/entities/DataTree/types.ts
+++ b/app/client/src/ce/entities/DataTree/types.ts
@@ -193,6 +193,7 @@ export interface AppsmithEntity extends Omit<AppDataState, "store"> {
   currentPageName: string;
   workspaceName: string;
   appName: string;
+  currentEnvironmentName: string;
 }
 
 export interface DataTreeSeed {
diff --git a/app/client/src/ce/selectors/dataTreeCyclicSelectors.ts b/app/client/src/ce/selectors/dataTreeCyclicSelectors.ts
new file mode 100644
index 000000000000..f35376a6fe5c
--- /dev/null
+++ b/app/client/src/ce/selectors/dataTreeCyclicSelectors.ts
@@ -0,0 +1 @@
+export const getCurrentEnvironmentName = () => "";
diff --git a/app/client/src/ee/selectors/dataTreeCyclicSelectors.ts b/app/client/src/ee/selectors/dataTreeCyclicSelectors.ts
new file mode 100644
index 000000000000..c57905fbaeb0
--- /dev/null
+++ b/app/client/src/ee/selectors/dataTreeCyclicSelectors.ts
@@ -0,0 +1 @@
+export * from "ce/selectors/dataTreeCyclicSelectors";
diff --git a/app/client/src/selectors/dataTreeSelectors.ts b/app/client/src/selectors/dataTreeSelectors.ts
index b64f4fbba4f5..2d08d684946d 100644
--- a/app/client/src/selectors/dataTreeSelectors.ts
+++ b/app/client/src/selectors/dataTreeSelectors.ts
@@ -44,6 +44,8 @@ import {
 import { getCurrentApplication } from "ee/selectors/applicationSelectors";
 import { getCurrentAppWorkspace } from "ee/selectors/selectedWorkspaceSelectors";
 import type { PageListReduxState } from "reducers/entityReducers/pageListReducer";
+import { getCurrentEnvironmentName } from "ee/selectors/dataTreeCyclicSelectors";
+import { objectKeys } from "@appsmith/utils";
 
 export const getLoadingEntities = (state: AppState) =>
   state.evaluations.loadingEntities;
@@ -152,6 +154,7 @@ export const getUnevaluatedDataTree = createSelector(
   getCurrentAppWorkspace,
   getCurrentApplication,
   getCurrentPageName,
+  getCurrentEnvironmentName,
   (
     actions,
     jsActions,
@@ -162,6 +165,7 @@ export const getUnevaluatedDataTree = createSelector(
     currentWorkspace,
     currentApplication,
     getCurrentPageName,
+    currentEnvironmentName,
   ) => {
     let dataTree: UnEvalTree = {
       ...actions.dataTree,
@@ -183,6 +187,7 @@ export const getUnevaluatedDataTree = createSelector(
       currentPageName: getCurrentPageName,
       workspaceName: currentWorkspace.name,
       appName: currentApplication?.name,
+      currentEnvironmentName,
     } as AppsmithEntity;
     (dataTree.appsmith as AppsmithEntity).ENTITY_TYPE = ENTITY_TYPE.APPSMITH;
     dataTree = { ...dataTree, ...metaWidgets.dataTree };
@@ -225,7 +230,7 @@ export const getWidgetEvalValues = createSelector(
 export const getDataTreeForAutocomplete = createSelector(
   getDataTree,
   (tree: DataTree) => {
-    return _.omit(tree, Object.keys(DATATREE_INTERNAL_KEYWORDS));
+    return _.omit(tree, objectKeys(DATATREE_INTERNAL_KEYWORDS));
   },
 );