diff --git a/client/coral-framework/store.js b/client/coral-framework/store.js
index 0c403359d..439569ee1 100644
--- a/client/coral-framework/store.js
+++ b/client/coral-framework/store.js
@@ -3,15 +3,22 @@ import thunk from 'redux-thunk';
 import mainReducer from './reducers';
 import {client} from './client';
 
+const middlewares = [
+  applyMiddleware(client.middleware()),
+  applyMiddleware(thunk)
+];
+
+if (window.devToolsExtension) {
+
+  // we can't have the last argument of compose() be undefined
+  middlewares.push(window.devToolsExtension());
+}
+
 export default createStore(
   combineReducers({
     ...mainReducer,
     apollo: client.reducer()
   }),
   {},
-  compose(
-    applyMiddleware(client.middleware()),
-    applyMiddleware(thunk),
-    window.devToolsExtension && window.devToolsExtension()
-  )
+  compose(...middlewares)
 );