diff --git a/package.json b/package.json
index a615192..aaefc97 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
   "main": "index.js",
   "scripts": {
     "build": "webpack",
-    "build:production": "webpack -p --optimize-minimize",
+    "build:production": "ENVIRONMENT=production webpack -p --optimize-minimize",
     "watch": "webpack --progress --watch",
     "start": "node serve.js"
   },
diff --git a/webpack.config.js b/webpack.config.js
index 71fd957..580af50 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -5,6 +5,8 @@ const defines = {
   "DEFAULT_WS_URI": process.env.WEBSOCKET_URI || "ws://localhost:8412/"
 };
 
+const env = process.env.ENVIRONMENT || "development";
+
 module.exports = {
   devtool: "source-map",
   entry: [
@@ -50,10 +52,10 @@ module.exports = {
     ]
   },
   plugins:[
-    new webpack.HotModuleReplacementPlugin(),
+    (env !== "production" && new webpack.HotModuleReplacementPlugin()),
     new webpack.EnvironmentPlugin(defines),
     new webpack.NamedModulesPlugin(),
-  ],
+  ].filter(p => p),
   resolve: {
     alias: {
       "react": "preact-compat",