diff --git a/lib/http-worker.js b/lib/http-worker.js
index c46d1b3f7..1937b7ad7 100644
--- a/lib/http-worker.js
+++ b/lib/http-worker.js
@@ -735,7 +735,8 @@ var server = Http.createServer(app);
 nThen(function (w) {
     server.listen(Env.httpPort, Env.httpAddress, w());
     if (Env.httpSafePort) {
-        server.listen(Env.httpSafePort, Env.httpAddress, w());
+        let safeServer = Http.createServer(app);
+        safeServer.listen(Env.httpSafePort, Env.httpAddress, w());
     }
     server.on('upgrade', function (req, socket, head) {
         // TODO warn admins that websockets should only be proxied in this way in a dev environment