diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3437aecd6..b4bdac608 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## In progress
 
+- Code reorganization and format normalization
+- Update to the right version of the Foundry types
+- Fix the dev server for fewer errors, and so that HMR works
+
 ## 1.15.14
 
 - Propagate region setting from location to scene
diff --git a/webpack.config.js b/webpack.config.js
index a1a1cbe22..42d599e73 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -61,10 +61,16 @@ module.exports = (env) => {
     },
     devServer: {
       hot: true,
+      client: {
+        overlay: {
+          errors: true,
+          warnings: true,
+        },
+      },
       proxy: [
         {
           context: (pathname) => {
-            return !pathname.match('^/sockjs')
+            return !pathname.match('^/ws')
           },
           target: 'http://localhost:30000',
           ws: true,