diff --git a/lib/server/proxy-server.js b/lib/server/proxy-server.js
index 5b1c1e38a..2e76d7fc1 100644
--- a/lib/server/proxy-server.js
+++ b/lib/server/proxy-server.js
@@ -25,7 +25,10 @@ module.exports = function createProxyServer (bs, scripts) {
 
     var proxy = utils.getServer(app, bs.options);
 
-    proxy.server.on("upgrade", app.handleUpgrade);
+    /**
+     * How best to handle websockets going forward?
+     */
+    //proxy.server.on("upgrade", app.handleUpgrade);
 
     return proxy;
 };