diff --git a/client/index.js b/client/index.js
index 4f766aea79..dbbb1ee07e 100644
--- a/client/index.js
+++ b/client/index.js
@@ -63,7 +63,7 @@ var newConnection = function() {
 		protocol: urlParts.protocol,
 		auth: urlParts.auth,
 		hostname: (urlParts.hostname === '0.0.0.0') ? window.location.hostname : urlParts.hostname,
-		port: urlParts.port,
+		port: (urlParts.port == '0') ? window.location.port : urlParts.port,
 		pathname: urlParts.path == null || urlParts.path === '/' ? "/sockjs-node" : urlParts.path
 	}));