diff --git a/app/templates/server/config/socketio(socketio).js b/app/templates/server/config/socketio(socketio).js
index 2fbbc07d6..03dc790ba 100644
--- a/app/templates/server/config/socketio(socketio).js
+++ b/app/templates/server/config/socketio(socketio).js
@@ -38,8 +38,8 @@ module.exports = function (socketio) {
   // }));
 
   socketio.on('connection', function (socket) {
-    socket.address = socket.handshake.address !== null ?
-            socket.handshake.address.address + ':' + socket.handshake.address.port :
+    socket.address = (socket.handshake.address !== null && socket.request.connection.remotePort) ?
+            socket.handshake.address.address + ':' + socket.request.connection.remotePort :
             process.env.DOMAIN;
 
     socket.connectedAt = new Date();