diff --git a/client/src/js/store/index.js b/client/src/js/store/index.js
index 2fd7c5f8..bb86856c 100644
--- a/client/src/js/store/index.js
+++ b/client/src/js/store/index.js
@@ -5,16 +5,16 @@ import reducer from '../reducers';
 import createSocketMiddleware from '../middleware/socket';
 import commands from '../commands';
 
-export default function configureStore(socket, history, initialState) {
-  const finalCreateStore = compose(
+export default function configureStore(socket, history) {
+  // eslint-disable-next-line no-underscore-dangle
+  const composeEnhancers = window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose;
+
+  return createStore(reducer, composeEnhancers(
     applyMiddleware(
       routerMiddleware(history),
       thunk,
       createSocketMiddleware(socket),
       commands
-    ),
-    window.devToolsExtension ? window.devToolsExtension() : f => f
-  )(createStore);
-
-  return finalCreateStore(reducer, initialState);
+    )
+  ));
 }