diff --git a/client/epics/night-mode-epic.js b/client/epics/night-mode-epic.js
index b6e84b16bf..ae27c26575 100644
--- a/client/epics/night-mode-epic.js
+++ b/client/epics/night-mode-epic.js
@@ -35,12 +35,13 @@ export default function nightModeSaga(
       }
     })
     .filter(() => false);
+
   const toggle = actions
     .filter(({ type }) => types.toggleNightMode === type);
 
   const optimistic = toggle
     .flatMap(() => {
-      const { theme } = themeSelector(getState());
+      const theme = themeSelector(getState());
       const newTheme = !theme || theme === 'default' ? 'night' : 'default';
       persistTheme(newTheme);
       return Observable.of(