diff --git a/app/client/src/actions/pluginActionActions.ts b/app/client/src/actions/pluginActionActions.ts
index 14167f38ad..57aab224e6 100644
--- a/app/client/src/actions/pluginActionActions.ts
+++ b/app/client/src/actions/pluginActionActions.ts
@@ -340,6 +340,25 @@ export const bindDataOnCanvas = (payload: {
   };
 };
 
+export const updateActionData = ({
+  data,
+  dataPath,
+  entityName,
+}: {
+  entityName: string;
+  dataPath: string;
+  data: unknown;
+}) => {
+  return {
+    type: ReduxActionTypes.UPDATE_ACTION_DATA,
+    payload: {
+      entityName,
+      dataPath,
+      data,
+    },
+  };
+};
+
 export default {
   createAction: createActionRequest,
   fetchActions,
diff --git a/app/client/src/ce/actions/evaluationActions.ts b/app/client/src/ce/actions/evaluationActions.ts
index 7b09915749..2504d7b1be 100644
--- a/app/client/src/ce/actions/evaluationActions.ts
+++ b/app/client/src/ce/actions/evaluationActions.ts
@@ -79,7 +79,6 @@ export const EVALUATE_REDUX_ACTIONS = [
   ReduxActionTypes.FETCH_JS_ACTIONS_VIEW_MODE_SUCCESS,
   ReduxActionErrorTypes.FETCH_JS_ACTIONS_VIEW_MODE_ERROR,
   ReduxActionTypes.UPDATE_JS_ACTION_BODY_SUCCESS,
-  ReduxActionTypes.SET_JS_FUNCTION_EXECUTION_DATA,
   // App Data
   ReduxActionTypes.SET_APP_MODE,
   ReduxActionTypes.FETCH_USER_DETAILS_SUCCESS,
diff --git a/app/client/src/ce/constants/ReduxActionConstants.tsx b/app/client/src/ce/constants/ReduxActionConstants.tsx
index f252b2718f..76fe684c23 100644
--- a/app/client/src/ce/constants/ReduxActionConstants.tsx
+++ b/app/client/src/ce/constants/ReduxActionConstants.tsx
@@ -867,6 +867,7 @@ const ActionTypes = {
   DELETE_MULTIPLE_APPLICATION_SUCCESS: "DELETE_MULTIPLE_APPLICATION_SUCCESS",
   DELETE_MULTIPLE_APPLICATION_CANCEL: "DELETE_MULTIPLE_APPLICATION_CANCEL",
   TRIGGER_EVAL: "TRIGGER_EVAL",
+  UPDATE_ACTION_DATA: "UPDATE_ACTION_DATA",
 };
 
 export const ReduxActionTypes = {
diff --git a/app/client/src/ce/sagas/ActionExecution/ActionExecutionSagas.ts b/app/client/src/ce/sagas/ActionExecution/ActionExecutionSagas.ts
index 3cf4627040..1e2fd6ad96 100644
--- a/app/client/src/ce/sagas/ActionExecution/ActionExecutionSagas.ts
+++ b/app/client/src/ce/sagas/ActionExecution/ActionExecutionSagas.ts
@@ -7,7 +7,14 @@ import type {
 } from "constants/AppsmithActionConstants/ActionConstants";
 import { TriggerKind } from "constants/AppsmithActionConstants/ActionConstants";
 import * as log from "loglevel";
-import { all, call, put, takeEvery, takeLatest } from "redux-saga/effects";
+import {
+  all,
+  call,
+  put,
+  takeEvery,
+  takeLatest,
+  select,
+} from "redux-saga/effects";
 import {
   evaluateActionSelectorFieldSaga,
   evaluateAndExecuteDynamicTrigger,
@@ -19,7 +26,10 @@ import copySaga from "sagas/ActionExecution/CopyActionSaga";
 import resetWidgetActionSaga from "sagas/ActionExecution/ResetWidgetActionSaga";
 import showAlertSaga from "sagas/ActionExecution/ShowAlertActionSaga";
 import executePluginActionTriggerSaga from "sagas/ActionExecution/PluginActionSaga";
-import { clearActionResponse } from "actions/pluginActionActions";
+import {
+  clearActionResponse,
+  updateActionData,
+} from "actions/pluginActionActions";
 import {
   closeModalSaga,
   openModalSaga,
@@ -32,6 +42,8 @@ import {
 } from "sagas/ActionExecution/geolocationSaga";
 import { postMessageSaga } from "sagas/ActionExecution/PostMessageSaga";
 import type { ActionDescription } from "@appsmith/workers/Evaluation/fns";
+import { getActionById } from "selectors/editorSelectors";
+import type { AppState } from "@appsmith/reducers";
 
 export type TriggerMeta = {
   source?: TriggerSource;
@@ -58,6 +70,25 @@ export function* executeActionTriggers(
       break;
     case "CLEAR_PLUGIN_ACTION":
       yield put(clearActionResponse(trigger.payload.actionId));
+      const action: ReturnType<typeof getActionById> = yield select(
+        (state: AppState) =>
+          getActionById(state, {
+            match: {
+              params: {
+                apiId: trigger.payload.actionId,
+              },
+            },
+          }),
+      );
+      if (action) {
+        yield put(
+          updateActionData({
+            entityName: action.name,
+            dataPath: "data",
+            data: undefined,
+          }),
+        );
+      }
       break;
     case "NAVIGATE_TO":
       yield call(navigateActionSaga, trigger);
diff --git a/app/client/src/ce/workers/Evaluation/evalWorkerActions.ts b/app/client/src/ce/workers/Evaluation/evalWorkerActions.ts
index 7671120611..78ffdc65a5 100644
--- a/app/client/src/ce/workers/Evaluation/evalWorkerActions.ts
+++ b/app/client/src/ce/workers/Evaluation/evalWorkerActions.ts
@@ -11,6 +11,7 @@ export enum EVAL_WORKER_SYNC_ACTION {
   INIT_FORM_EVAL = "INIT_FORM_EVAL",
   UNINSTALL_LIBRARY = "UNINSTALL_LIBRARY",
   LINT_TREE = "LINT_TREE",
+  UPDATE_ACTION_DATA = "UPDATE_ACTION_DATA",
 }
 
 export enum EVAL_WORKER_ASYNC_ACTION {
diff --git a/app/client/src/ce/workers/Evaluation/evaluationUtils.ts b/app/client/src/ce/workers/Evaluation/evaluationUtils.ts
index 55eb846804..8a5e6e46b9 100644
--- a/app/client/src/ce/workers/Evaluation/evaluationUtils.ts
+++ b/app/client/src/ce/workers/Evaluation/evaluationUtils.ts
@@ -964,7 +964,7 @@ export function convertJSFunctionsToString(
     for (const funcName in jsFunctions) {
       if (jsCollection[funcName] instanceof String) {
         if (has(jsCollection, [funcName, "data"])) {
-          set(jsCollection, [`${funcName}.data`], jsCollection[funcName].data);
+          set(jsCollection, [`${funcName}.data`], {});
         }
         set(jsCollection, funcName, jsCollection[funcName].toString());
       }
diff --git a/app/client/src/entities/DataTree/dataTreeAction.ts b/app/client/src/entities/DataTree/dataTreeAction.ts
index 89fd03f4ee..14e9108c8c 100644
--- a/app/client/src/entities/DataTree/dataTreeAction.ts
+++ b/app/client/src/entities/DataTree/dataTreeAction.ts
@@ -54,7 +54,9 @@ export const generateDataTreeAction = (
       actionId: action.config.id,
       run: {},
       clear: {},
-      data: action.data ? action.data.body : undefined,
+      // Data is always set to undefined in the unevalTree
+      // Action data is updated directly to the dataTree (see updateActionData.ts)
+      data: undefined,
       isLoading: action.isLoading,
       responseMeta: {
         statusCode: action.data?.statusCode,
diff --git a/app/client/src/entities/DataTree/dataTreeJSAction.test.ts b/app/client/src/entities/DataTree/dataTreeJSAction.test.ts
index a8e6054e34..c50c8ecda6 100644
--- a/app/client/src/entities/DataTree/dataTreeJSAction.test.ts
+++ b/app/client/src/entities/DataTree/dataTreeJSAction.test.ts
@@ -124,11 +124,7 @@ describe("generateDataTreeJSAction", () => {
           },
         ],
       },
-      data: {
-        abcd: {
-          users: [{ id: 1, name: "John" }],
-        },
-      },
+      data: {},
     };
     const expectedData = {
       myVar1: [],
@@ -137,9 +133,7 @@ describe("generateDataTreeJSAction", () => {
       body: "export default {\n\tmyVar1: [],\n\tmyVar2: {},\n\tmyFun1: () => {\n\t\t//write code here\n\t},\n\tmyFun2: async () => {\n\t\t//use async-await or promises\n\t}\n}",
 
       myFun2: {
-        data: {
-          users: [{ id: 1, name: "John" }],
-        },
+        data: {},
       },
       myFun1: {
         data: {},
@@ -336,9 +330,7 @@ describe("generateDataTreeJSAction", () => {
       body: "export default {\n\tmyVar1: [],\n\tmyVar2: {},\n\tmyFun1: () => {\n\t\t//write code here\n\t return JSObject2.myFun2},\n\tmyFun2: async () => {\n\t\t//use async-await or promises\n\t}\n}",
       ENTITY_TYPE: "JSACTION",
       myFun2: {
-        data: {
-          users: [{ id: 1, name: "John" }],
-        },
+        data: {},
       },
       myFun1: {
         data: {},
diff --git a/app/client/src/entities/DataTree/dataTreeJSAction.ts b/app/client/src/entities/DataTree/dataTreeJSAction.ts
index 8258a44acd..18e7fec555 100644
--- a/app/client/src/entities/DataTree/dataTreeJSAction.ts
+++ b/app/client/src/entities/DataTree/dataTreeJSAction.ts
@@ -42,7 +42,9 @@ export const generateDataTreeJSAction = (js: JSCollectionData): any => {
       dynamicBindingPathList.push({ key: action.name });
       dependencyMap["body"].push(action.name);
       actionsData[action.name] = {
-        data: (js.data && js.data[`${action.id}`]) || {},
+        // Data is always set to {} in the unevalTree
+        // Action data is updated directly to the dataTree (see updateActionData.ts)
+        data: {},
       };
     }
   }
diff --git a/app/client/src/sagas/ActionExecution/PluginActionSaga.ts b/app/client/src/sagas/ActionExecution/PluginActionSaga.ts
index f117f4adbd..efe6acc0d3 100644
--- a/app/client/src/sagas/ActionExecution/PluginActionSaga.ts
+++ b/app/client/src/sagas/ActionExecution/PluginActionSaga.ts
@@ -15,6 +15,7 @@ import {
   executePluginActionSuccess,
   runAction,
   updateAction,
+  updateActionData,
 } from "actions/pluginActionActions";
 import { makeUpdateJSCollection } from "sagas/JSPaneSagas";
 
@@ -101,7 +102,7 @@ import * as log from "loglevel";
 import { EMPTY_RESPONSE } from "components/editorComponents/emptyResponse";
 import type { AppState } from "@appsmith/reducers";
 import { DEFAULT_EXECUTE_ACTION_TIMEOUT_MS } from "@appsmith/constants/ApiConstants";
-import { evaluateActionBindings } from "sagas/EvaluationsSaga";
+import { evalWorker, evaluateActionBindings } from "sagas/EvaluationsSaga";
 import { isBlobUrl, parseBlobUrl } from "utils/AppsmithUtils";
 import { getType, Types } from "utils/TypeHelpers";
 import { matchPath } from "react-router";
@@ -158,6 +159,7 @@ import {
   getCurrentEnvironmentDetails,
   getCurrentEnvironmentName,
 } from "@appsmith/selectors/environmentSelectors";
+import { EVAL_WORKER_ACTIONS } from "@appsmith/workers/Evaluation/evalWorkerActions";
 
 enum ActionResponseDataTypes {
   BINARY = "BINARY",
@@ -1171,6 +1173,13 @@ function* executePageLoadAction(pageAction: PageAction) {
           data: payload,
         }),
       );
+      yield put(
+        updateActionData({
+          entityName: action.name,
+          dataPath: "data",
+          data: payload.body,
+        }),
+      );
       PerformanceTracker.stopAsyncTracking(
         PerformanceTransactionName.EXECUTE_ACTION,
         {
@@ -1226,6 +1235,13 @@ function* executePageLoadAction(pageAction: PageAction) {
           isPageLoad: true,
         }),
       );
+      yield put(
+        updateActionData({
+          entityName: action.name,
+          dataPath: "data",
+          data: payload.body,
+        }),
+      );
       yield take(ReduxActionTypes.SET_EVALUATED_TREE);
     }
   }
@@ -1379,6 +1395,14 @@ function* executePluginActionSaga(
         response: payload,
       }),
     );
+
+    yield put(
+      updateActionData({
+        entityName: pluginAction.name,
+        dataPath: "data",
+        data: payload.body,
+      }),
+    );
     // TODO: Plugins are not always fetched before on page load actions are executed.
     try {
       let plugin: Plugin | undefined;
@@ -1432,6 +1456,13 @@ function* executePluginActionSaga(
         response: EMPTY_RESPONSE,
       }),
     );
+    yield put(
+      updateActionData({
+        entityName: pluginAction.name,
+        dataPath: "data",
+        data: EMPTY_RESPONSE.body,
+      }),
+    );
     if (e instanceof UserCancelledActionExecutionError) {
       // Case: user cancelled the request of file upload
       if (filePickerInstrumentation.numberOfFiles > 0) {
@@ -1500,6 +1531,13 @@ function* clearTriggerActionResponse() {
     // Clear the action response if the action has data and is not executeOnLoad.
     if (action.data && !action.config.executeOnLoad) {
       yield put(clearActionResponse(action.config.id));
+      yield put(
+        updateActionData({
+          entityName: action.config.name,
+          dataPath: "data",
+          data: undefined,
+        }),
+      );
     }
   }
 }
@@ -1542,6 +1580,23 @@ function* softRefreshActionsSaga() {
   });
 }
 
+function* handleUpdateActionData(
+  action: ReduxAction<{
+    entityName: string;
+    dataPath: string;
+    data: unknown;
+  }>,
+) {
+  const { data, dataPath, entityName } = action.payload;
+  yield call(evalWorker.request, EVAL_WORKER_ACTIONS.UPDATE_ACTION_DATA, [
+    {
+      entityName,
+      dataPath,
+      data,
+    },
+  ]);
+}
+
 export function* watchPluginActionExecutionSagas() {
   yield all([
     takeLatest(ReduxActionTypes.RUN_ACTION_REQUEST, runActionSaga),
@@ -1555,5 +1610,6 @@ export function* watchPluginActionExecutionSagas() {
     ),
     takeLatest(ReduxActionTypes.PLUGIN_SOFT_REFRESH, softRefreshActionsSaga),
     takeEvery(ReduxActionTypes.EXECUTE_JS_UPDATES, makeUpdateJSCollection),
+    takeEvery(ReduxActionTypes.UPDATE_ACTION_DATA, handleUpdateActionData),
   ]);
 }
diff --git a/app/client/src/sagas/OnboardingSagas.ts b/app/client/src/sagas/OnboardingSagas.ts
index c4cc361f3c..f32052827d 100644
--- a/app/client/src/sagas/OnboardingSagas.ts
+++ b/app/client/src/sagas/OnboardingSagas.ts
@@ -57,7 +57,10 @@ import { RenderModes } from "constants/WidgetConstants";
 import log from "loglevel";
 import { getDataTree } from "selectors/dataTreeSelectors";
 import { getWidgets } from "./selectors";
-import { clearActionResponse } from "actions/pluginActionActions";
+import {
+  clearActionResponse,
+  updateActionData,
+} from "actions/pluginActionActions";
 import {
   importApplication,
   updateApplicationLayout,
@@ -216,6 +219,13 @@ function* setUpTourAppSaga() {
   // Update getCustomers query body
   const query: ActionData | undefined = yield select(getQueryAction);
   yield put(clearActionResponse(query?.config.id ?? ""));
+  yield put(
+    updateActionData({
+      entityName: query?.config.name || "",
+      dataPath: "data",
+      data: undefined,
+    }),
+  );
   const applicationId: string = yield select(getCurrentApplicationId);
   yield put(
     updateApplicationLayout(applicationId || "", {
diff --git a/app/client/src/workers/Evaluation/dataStore/index.ts b/app/client/src/workers/Evaluation/dataStore/index.ts
new file mode 100644
index 0000000000..4cb2a0bc92
--- /dev/null
+++ b/app/client/src/workers/Evaluation/dataStore/index.ts
@@ -0,0 +1,34 @@
+import { convertPathToString } from "@appsmith/workers/Evaluation/evaluationUtils";
+import type { Diff } from "deep-diff";
+import type { DataTree } from "entities/DataTree/dataTreeFactory";
+import { get, set, unset } from "lodash";
+
+export type TDataStore = Record<string, Record<string, unknown>>;
+export default class DataStore {
+  private static store: TDataStore = {};
+
+  static setActionData(fullPath: string, value: unknown) {
+    set(this.store, fullPath, value);
+  }
+
+  static getActionData(fullPath: string): unknown | undefined {
+    return get(this.store, fullPath, undefined);
+  }
+  static getDataStore() {
+    return this.store;
+  }
+  static deleteActionData(fullPath: string) {
+    unset(this.store, fullPath);
+  }
+  static clear() {
+    this.store = {};
+  }
+  static update(dataTreeDiff: Diff<DataTree, DataTree>[]) {
+    const deleteDiffs = dataTreeDiff.filter((diff) => diff.kind === "D");
+    deleteDiffs.forEach((diff) => {
+      const deletedPath = diff.path || [];
+      const deletedPathString = convertPathToString(deletedPath);
+      this.deleteActionData(deletedPathString);
+    });
+  }
+}
diff --git a/app/client/src/workers/Evaluation/dataStore/utils.ts b/app/client/src/workers/Evaluation/dataStore/utils.ts
new file mode 100644
index 0000000000..d98c55bbbc
--- /dev/null
+++ b/app/client/src/workers/Evaluation/dataStore/utils.ts
@@ -0,0 +1,28 @@
+import type { DataTree } from "entities/DataTree/dataTreeFactory";
+import type { TDataStore } from ".";
+import {
+  isAction,
+  isJSAction,
+} from "@appsmith/workers/Evaluation/evaluationUtils";
+import { get, isEmpty, set } from "lodash";
+
+export function updateTreeWithData(tree: DataTree, dataStore: TDataStore) {
+  if (isEmpty(dataStore)) return;
+  for (const entityName of Object.keys(tree)) {
+    const entity = tree[entityName];
+    if (!dataStore.hasOwnProperty(entityName)) continue;
+    if (isAction(entity)) {
+      set(entity, "data", get(dataStore, `${entityName}.data`));
+    }
+    if (isJSAction(entity)) {
+      const allFunctionsInStore = Object.keys(dataStore[entityName]);
+      allFunctionsInStore.forEach((functionName) => {
+        set(
+          entity[functionName],
+          `data`,
+          get(dataStore, `${entityName}.${functionName}.data`),
+        );
+      });
+    }
+  }
+}
diff --git a/app/client/src/workers/Evaluation/fns/utils/TriggerEmitter.ts b/app/client/src/workers/Evaluation/fns/utils/TriggerEmitter.ts
index 4d673705dd..7d50754db0 100644
--- a/app/client/src/workers/Evaluation/fns/utils/TriggerEmitter.ts
+++ b/app/client/src/workers/Evaluation/fns/utils/TriggerEmitter.ts
@@ -15,6 +15,9 @@ import type {
   TriggerKind,
   TriggerSource,
 } from "constants/AppsmithActionConstants/ActionConstants";
+import type { UpdateActionProps } from "workers/Evaluation/handlers/updateActionData";
+import { handleActionsDataUpdate } from "workers/Evaluation/handlers/updateActionData";
+import { getEntityNameAndPropertyPath } from "@appsmith/workers/Evaluation/evaluationUtils";
 
 const _internalSetTimeout = self.setTimeout;
 const _internalClearTimeout = self.clearTimeout;
@@ -123,6 +126,20 @@ const fnExecutionDataHandler = priorityBatchedActionHandler((data) => {
     { JSExecutionData: {}, JSExecutionErrors: {} },
   );
 
+  const updateActionProps: UpdateActionProps[] = Object.entries(
+    batchedData.JSExecutionData,
+  ).map(([jsFnFullName, data]) => {
+    const { entityName, propertyPath: funcName } =
+      getEntityNameAndPropertyPath(jsFnFullName);
+    return {
+      entityName,
+      dataPath: `${funcName}.data`,
+      data,
+    };
+  });
+
+  handleActionsDataUpdate(updateActionProps);
+
   WorkerMessenger.ping({
     method: MAIN_THREAD_ACTION.PROCESS_JS_FUNCTION_EXECUTION,
     data: batchedData,
diff --git a/app/client/src/workers/Evaluation/handlers/evalTree.ts b/app/client/src/workers/Evaluation/handlers/evalTree.ts
index c171fae218..eb105ccd03 100644
--- a/app/client/src/workers/Evaluation/handlers/evalTree.ts
+++ b/app/client/src/workers/Evaluation/handlers/evalTree.ts
@@ -24,6 +24,7 @@ import { setEvalContext } from "../evaluate";
 import { getJSVariableCreatedEvents } from "../JSObject/JSVariableEvents";
 import { errorModifier } from "../errorModifier";
 import { generateOptimisedUpdatesAndSetPrevState } from "../helpers";
+import DataStore from "../dataStore";
 
 export let replayMap: Record<string, ReplayEntity<any>> | undefined;
 export let dataTreeEvaluator: DataTreeEvaluator | undefined;
@@ -250,5 +251,6 @@ export function clearCache() {
   dataTreeEvaluator = undefined;
   clearAllIntervals();
   JSObjectCollection.clear();
+  DataStore.clear();
   return true;
 }
diff --git a/app/client/src/workers/Evaluation/handlers/index.ts b/app/client/src/workers/Evaluation/handlers/index.ts
index cf0f6f6118..b02811d970 100644
--- a/app/client/src/workers/Evaluation/handlers/index.ts
+++ b/app/client/src/workers/Evaluation/handlers/index.ts
@@ -16,6 +16,7 @@ import setupEvaluationEnvironment, {
   setEvaluationVersion,
 } from "./setupEvalEnv";
 import validateProperty from "./validateProperty";
+import updateActionData from "./updateActionData";
 
 const syncHandlerMap: Record<
   EVAL_WORKER_SYNC_ACTION,
@@ -33,6 +34,7 @@ const syncHandlerMap: Record<
   [EVAL_WORKER_ACTIONS.CLEAR_CACHE]: clearCache,
   [EVAL_WORKER_ACTIONS.SET_EVALUATION_VERSION]: setEvaluationVersion,
   [EVAL_WORKER_ACTIONS.INIT_FORM_EVAL]: initFormEval,
+  [EVAL_WORKER_ACTIONS.UPDATE_ACTION_DATA]: updateActionData,
 };
 
 const asyncHandlerMap: Record<
diff --git a/app/client/src/workers/Evaluation/handlers/updateActionData.ts b/app/client/src/workers/Evaluation/handlers/updateActionData.ts
new file mode 100644
index 0000000000..d22a725d27
--- /dev/null
+++ b/app/client/src/workers/Evaluation/handlers/updateActionData.ts
@@ -0,0 +1,36 @@
+import { dataTreeEvaluator } from "./evalTree";
+import type { EvalWorkerSyncRequest } from "../types";
+import { set } from "lodash";
+import { evalTreeWithChanges } from "../evalTreeWithChanges";
+import DataStore from "../dataStore";
+
+export interface UpdateActionProps {
+  entityName: string;
+  dataPath: string;
+  data: unknown;
+}
+export default function (request: EvalWorkerSyncRequest) {
+  const actionsDataToUpdate: UpdateActionProps[] = request.data;
+  handleActionsDataUpdate(actionsDataToUpdate);
+}
+
+export function handleActionsDataUpdate(actionsToUpdate: UpdateActionProps[]) {
+  if (!dataTreeEvaluator) {
+    return {};
+  }
+  const evalTree = dataTreeEvaluator.getEvalTree();
+
+  for (const actionToUpdate of actionsToUpdate) {
+    const { data, dataPath, entityName } = actionToUpdate;
+    // update the evaltree
+    set(evalTree, `${entityName}.[${dataPath}]`, data);
+    // Update context
+    set(self, `${entityName}.[${dataPath}]`, data);
+    // Update the datastore
+    DataStore.setActionData(`${entityName}.${dataPath}`, data);
+  }
+  const updatedProperties: string[][] = actionsToUpdate.map(
+    ({ dataPath, entityName }) => [entityName, dataPath],
+  );
+  evalTreeWithChanges(updatedProperties, []);
+}
diff --git a/app/client/src/workers/common/DataTreeEvaluator/index.ts b/app/client/src/workers/common/DataTreeEvaluator/index.ts
index 3627abd4ce..988c444357 100644
--- a/app/client/src/workers/common/DataTreeEvaluator/index.ts
+++ b/app/client/src/workers/common/DataTreeEvaluator/index.ts
@@ -94,6 +94,7 @@ import type {
   ValidationConfig,
 } from "constants/PropertyControlConstants";
 import { klona } from "klona/full";
+import { klona as klonaJSON } from "klona/json";
 import type { EvalMetaUpdates } from "@appsmith/workers/common/DataTreeEvaluator/types";
 import {
   updateDependencyMap,
@@ -123,6 +124,8 @@ import userLogs from "workers/Evaluation/fns/overrides/console";
 import ExecutionMetaData from "workers/Evaluation/fns/utils/ExecutionMetaData";
 import DependencyMap from "entities/DependencyMap";
 import { DependencyMapUtils } from "entities/DependencyMap/DependencyMapUtils";
+import DataStore from "workers/Evaluation/dataStore";
+import { updateTreeWithData } from "workers/Evaluation/dataStore/utils";
 
 type SortedDependencies = Array<string>;
 export type EvalProps = {
@@ -339,6 +342,7 @@ export default class DataTreeEvaluator {
     const evaluationStartTime = performance.now();
 
     const evaluationOrder = this.sortedDependencies;
+
     // Evaluate
     const { evalMetaUpdates, evaluatedTree, staleMetaIds } = this.evaluateTree(
       this.oldUnEvalTree,
@@ -495,6 +499,7 @@ export default class DataTreeEvaluator {
         isNewWidgetAdded: false,
       };
     }
+    DataStore.update(differences);
     let isNewWidgetAdded = false;
 
     //find all differences which can lead to updating of dependency map
@@ -937,6 +942,7 @@ export default class DataTreeEvaluator {
     staleMetaIds: string[];
   } {
     const tree = klona(oldUnevalTree);
+    updateTreeWithData(tree, klonaJSON(DataStore.getDataStore()));
 
     errorModifier.updateAsyncFunctions(
       tree,