diff --git a/package.json b/package.json
index cc9a47a..3fdf6e3 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
 {
     "name": "canape",
     "scripts": {
-        "start": "./node_modules/webpack/bin/webpack.js -d --progress --colors --watch",
-        "build": "./node_modules/webpack/bin/webpack.js --mode=production -p --progress --colors",
+        "start": "NODE_ENV=development ./node_modules/webpack/bin/webpack.js -d --progress --colors --watch",
+        "build": "NODE_ENV=production  ./node_modules/webpack/bin/webpack.js -p --progress --colors",
         "lint": "./node_modules/eslint/bin/eslint.js frontend/."
     },
     "dependencies": {
diff --git a/webpack.config.js b/webpack.config.js
index 66e84f3..c35f272 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -2,14 +2,18 @@ var webpack = require("webpack");
 var path = require("path");
 var WebpackPwaManifest = require("webpack-pwa-manifest")
 
+var mode = "development";
 var BUILD_DIR = path.resolve(__dirname, "build/public/");
+
 if (process.env.NODE_ENV === "production") {
+  mode = "production";
   BUILD_DIR = path.resolve(__dirname, "canapeapp/public/");
 }
 
 var SRC_DIR = path.resolve(__dirname, "frontend/js");
 
 const config = {
+  mode: mode,
   entry: path.join(SRC_DIR, "app.js"),
   output: {
     path: BUILD_DIR,