diff --git a/app/client/src/ce/constants/ReduxActionConstants.tsx b/app/client/src/ce/constants/ReduxActionConstants.tsx
index cdfc100c77..fc02ab7163 100644
--- a/app/client/src/ce/constants/ReduxActionConstants.tsx
+++ b/app/client/src/ce/constants/ReduxActionConstants.tsx
@@ -926,6 +926,7 @@ const ActionTypes = {
   UPDATE_THEME_SETTING: "UPDATE_THEME_SETTING",
   SET_IDE_EDITOR_VIEW_MODE: "SET_IDE_EDITOR_VIEW_MODE",
   SET_IDE_EDITOR_PAGES_ACTIVE_STATUS: "SET_IDE_EDITOR_PAGES_ACTIVE_STATUS",
+  SWITCH_ENVIRONMENT_SUCCESS: "SWITCH_ENVIRONMENT_SUCCESS",
 };
 
 export const ReduxActionTypes = {
diff --git a/app/client/src/reducers/uiReducers/debuggerReducer.ts b/app/client/src/reducers/uiReducers/debuggerReducer.ts
index de9c9d504c..9ac2c506ec 100644
--- a/app/client/src/reducers/uiReducers/debuggerReducer.ts
+++ b/app/client/src/reducers/uiReducers/debuggerReducer.ts
@@ -5,6 +5,7 @@ import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
 import { omit, isUndefined, isEmpty } from "lodash";
 import equal from "fast-deep-equal";
 import { ActionExecutionResizerHeight } from "pages/Editor/APIEditor/constants";
+import { klona } from "klona";
 
 export const DefaultDebuggerContext = {
   scrollPosition: 0,
@@ -159,6 +160,10 @@ const debuggerReducer = createImmerReducer(initialState, {
   ) => {
     state.context = action.context;
   },
+  // Resetting debugger state after env switch
+  [ReduxActionTypes.SWITCH_ENVIRONMENT_SUCCESS]: () => {
+    return klona(initialState);
+  },
 });
 
 export interface DebuggerReduxState {
diff --git a/app/client/src/sagas/ActionExecution/PluginActionSaga.ts b/app/client/src/sagas/ActionExecution/PluginActionSaga.ts
index 7b3528a55a..f836ff51e4 100644
--- a/app/client/src/sagas/ActionExecution/PluginActionSaga.ts
+++ b/app/client/src/sagas/ActionExecution/PluginActionSaga.ts
@@ -1617,6 +1617,7 @@ function* softRefreshActionsSaga() {
   toast.show(createMessage(SWITCH_ENVIRONMENT_SUCCESS, currentEnvName), {
     kind: "success",
   });
+  yield put({ type: ReduxActionTypes.SWITCH_ENVIRONMENT_SUCCESS });
 }
 
 function* handleUpdateActionData(