diff --git a/package.json b/package.json
index fb370a20..a9317f39 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
     "test:browser": "webpack-dev-server --config=webpack.config-browser.js",
     "test:client": "nyc --nycrc-path=test/.nycrc-mocha-webpack mocha-webpack --colors --opts=test/mocha-webpack.opts",
     "test:server": "nyc --nycrc-path=test/.nycrc-mocha mocha --colors",
-    "watch": "webpack-dev-server --hot --inline"
+    "watch": "webpack --watch"
   },
   "keywords": [
     "lounge",
diff --git a/webpack.config.js b/webpack.config.js
index fbce6d9e..0fc64874 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -141,19 +141,6 @@ const config = {
 		// socket.io uses debug, we don't need it
 		new webpack.NormalModuleReplacementPlugin(/debug/, path.resolve(__dirname, "scripts/noop.js")),
 	],
-	devServer: {
-		port: 9001,
-		proxy: {
-			"/": {
-				context: ["**", "!/css/**", "!/js/**"],
-				target: "http://localhost:9000/",
-			},
-			"/socket.io": {
-				ws: true,
-				target: "http://localhost:9000",
-			},
-		},
-	},
 };
 
 module.exports = config;