diff --git a/package.json b/package.json
index 75c2a5afc..9e32ae919 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
     "build:webpack": "cross-env NODE_ENV=production webpack --config webpack.config.prod.js --progress",
     "build:analyze": "cross-env NODE_ENV=production webpack --config webpack.config.prod.js --json | webpack-bundle-size-analyzer",
     "build": "npm run clean && npm run build:webpack",
-    "heroku-postbuild": "npm build",
+    "heroku-postbuild": "npm run build",
     "start": "cross-env NODE_ENV=development DEBUG=1 ./node_modules/.bin/nodemon --watch server index.js",
     "lint": "eslint src"
   },
diff --git a/src/index.js b/src/index.js
index 09b6514a9..c3a1dd120 100644
--- a/src/index.js
+++ b/src/index.js
@@ -28,16 +28,16 @@ import DocumentScene from 'scenes/DocumentScene';
 import SlackAuth from 'scenes/SlackAuth';
 
 // Redux
+let store;
+const routerMiddlewareWithHistory = routerMiddleware(History);
 if (process.env.PRODUCTION) {
-  const routerMiddlewareWithHistory = routerMiddleware(History);
-  const store = createStore(reducers, applyMiddleware(
+  store = createStore(reducers, applyMiddleware(
     thunkMiddleware,
     routerMiddlewareWithHistory,
   ), autoRehydrate());
 } else {
   const loggerMiddleware = createLogger();
-  const routerMiddlewareWithHistory = routerMiddleware(History);
-  const store = createStore(reducers, applyMiddleware(
+  store = createStore(reducers, applyMiddleware(
     thunkMiddleware,
     routerMiddlewareWithHistory,
     loggerMiddleware,