diff --git a/frontend/package.json b/frontend/package.json
index 39f97fa79b..975047a812 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -26,7 +26,7 @@
     "build": "npm run build:assets && npm run build:html",
     "build:assets": "NODE_ENV=production webpack -p",
     "build:html": "cp public/*.* dist/.",
-    "start": "NODE_ENV=development webpack-dev-server --config webpack.config.js --progress --colors --port 3000",
+    "start": "NODE_ENV=development webpack-dev-server --config webpack.config.js --progress --colors",
     "start:heroku": "UNLEASH_API=http://unleash.herokuapp.com npm run start",
     "lint": "eslint . --ext=js,jsx",
     "test": "npm run build",
diff --git a/frontend/webpack.config.js b/frontend/webpack.config.js
index efea565f3d..3dfeb4c5de 100644
--- a/frontend/webpack.config.js
+++ b/frontend/webpack.config.js
@@ -76,5 +76,6 @@ module.exports = {
                 secure: false,
             },
         },
+        port: process.env.PORT || 3000,
     },
 };