diff --git a/ts/state/ducks/debug.tsx b/ts/state/ducks/debug.tsx
index f263b833b..e0ed552ea 100644
--- a/ts/state/ducks/debug.tsx
+++ b/ts/state/ducks/debug.tsx
@@ -14,7 +14,8 @@ const debugSlice = createSlice({
   reducers: {
     setDebugMode: (state, action: PayloadAction<boolean>) => {
       (window as Window).sessionFeatureFlags.debug.debugLogging = action.payload;
-      return { ...state, debugMode: action.payload };
+      state.debugMode = action.payload;
+      return state;
     },
   },
 });
diff --git a/ts/state/selectors/debug.ts b/ts/state/selectors/debug.ts
index 7a79d83c0..28ddde742 100644
--- a/ts/state/selectors/debug.ts
+++ b/ts/state/selectors/debug.ts
@@ -2,7 +2,7 @@ import { useSelector } from 'react-redux';
 import type { StateType } from '../reducer';
 
 const getDebugMode = (state: StateType): boolean => {
-  return window.sessionFeatureFlags.debug.debugLogging || state.debug.debugMode;
+  return window.sessionFeatureFlags?.debug?.debugLogging || state?.debug?.debugMode || false;
 };
 
 export const useDebugMode = (): boolean => {