diff --git a/app/client/cypress/support/Pages/AggregateHelper.ts b/app/client/cypress/support/Pages/AggregateHelper.ts
index de301009b4..12aab06c45 100644
--- a/app/client/cypress/support/Pages/AggregateHelper.ts
+++ b/app/client/cypress/support/Pages/AggregateHelper.ts
@@ -8,6 +8,9 @@ import EditorNavigator from "./EditorNavigation";
 import { EntityType } from "./EditorNavigation";
 import ClickOptions = Cypress.ClickOptions;
 import { DEBOUNCE_WAIT_TIME_ON_INPUT_CHANGE } from "../../../src/constants/WidgetConstants";
+const {
+  SAVE_TRIGGER_DELAY_MS,
+} = require("../../../src/components/editorComponents/CodeEditor/debounceConstants");
 
 type ElementType = string | JQuery<HTMLElement>;
 
@@ -296,6 +299,11 @@ export class AggregateHelper {
   }
 
   public AssertAutoSave() {
+    // After fix made in https://github.com/appsmithorg/appsmith/pull/40239 to make save state and nw call in sync
+    // We will need to wait for the debounced time before we make any assertions on save state, otherwise
+    // we might run into situation where absence of save is asserted but save actually hasn't happened
+    // Additional 100ms added to avoid flaky issues that might be caused by race condition.
+    this.Sleep(SAVE_TRIGGER_DELAY_MS + 100);
     let saveStatus = this.CheckForPageSaveError();
     // wait for save query to trigger & n/w call to finish occuring
     if (!saveStatus)
diff --git a/app/client/src/components/editorComponents/CodeEditor/debounceConstants.ts b/app/client/src/components/editorComponents/CodeEditor/debounceConstants.ts
new file mode 100644
index 0000000000..609dd6e0a2
--- /dev/null
+++ b/app/client/src/components/editorComponents/CodeEditor/debounceConstants.ts
@@ -0,0 +1 @@
+export const SAVE_TRIGGER_DELAY_MS = 600;
diff --git a/app/client/src/components/editorComponents/CodeEditor/index.tsx b/app/client/src/components/editorComponents/CodeEditor/index.tsx
index c2b261eb12..c621d571a0 100644
--- a/app/client/src/components/editorComponents/CodeEditor/index.tsx
+++ b/app/client/src/components/editorComponents/CodeEditor/index.tsx
@@ -161,6 +161,7 @@ import { getEachEntityInformation } from "ee/utils/autocomplete/EntityDefinition
 import { getCurrentPageId } from "selectors/editorSelectors";
 import { executeCommandAction } from "actions/pluginActionActions";
 import { PEEK_OVERLAY_DELAY } from "./PeekOverlayPopup/constants";
+import { SAVE_TRIGGER_DELAY_MS } from "./debounceConstants";
 
 type ReduxStateProps = ReturnType<typeof mapStateToProps>;
 type ReduxDispatchProps = ReturnType<typeof mapDispatchToProps>;
@@ -269,8 +270,6 @@ interface State {
   isOpened: boolean;
   autoCompleteVisible: boolean;
   hinterOpen: boolean;
-  // Flag for determining whether the entity change has been started or not so that even if the initial and final value remains the same, the status should be changed to not loading
-  changeStarted: boolean;
   ctrlPressed: boolean;
   peekOverlayProps:
     | (PeekOverlayStateProps & {
@@ -314,7 +313,6 @@ class CodeEditor extends Component<Props, State> {
       isOpened: false,
       autoCompleteVisible: false,
       hinterOpen: false,
-      changeStarted: false,
       ctrlPressed: false,
       peekOverlayProps: undefined,
       showAIWindow: false,
@@ -1309,17 +1307,17 @@ class CodeEditor extends Component<Props, State> {
     instance?: CodeMirror.Editor,
     changeObj?: CodeMirror.EditorChangeLinkedList,
   ) => {
-    const value = this.editor?.getValue() || "";
+    const value = this.editor.getValue() || "";
     const inputValue = this.props.input.value || "";
 
     if (
       this.props.input.onChange &&
-      ((value !== inputValue && this.state.isFocused) ||
-        this.state.changeStarted)
+      value !== inputValue &&
+      this.state.isFocused
     ) {
-      this.setState({
-        changeStarted: false,
-      });
+      /* This action updates the status of the savingEntity to true so that any
+      shortcut commands do not execute before updating the entity in the store */
+      this.props.startingEntityUpdate();
       this.props.input.onChange(value);
     }
 
@@ -1364,29 +1362,12 @@ class CodeEditor extends Component<Props, State> {
     }
   };
 
-  handleDebouncedChange = _.debounce(this.handleChange, 600);
+  handleDebouncedChange = _.debounce(this.handleChange, SAVE_TRIGGER_DELAY_MS);
 
   startChange = (
     instance: CodeMirror.Editor,
     changeObj: CodeMirror.EditorChangeLinkedList,
   ) => {
-    /* This action updates the status of the savingEntity to true so that any
-      shortcut commands do not execute before updating the entity in the store */
-    const value = this.editor.getValue() || "";
-    const inputValue = this.props.input.value || "";
-
-    if (
-      this.props.input.onChange &&
-      value !== inputValue &&
-      this.state.isFocused &&
-      !this.state.changeStarted
-    ) {
-      this.setState({
-        changeStarted: true,
-      });
-      this.props.startingEntityUpdate();
-    }
-
     this.hidePeekOverlay();
     this.handleDebouncedChange(instance, changeObj);
   };