diff --git a/lib/server.js b/lib/server.js
index 3ebcb7d..f5eaf24 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -20,12 +20,12 @@ app._initializeWSS = function(server) {
   // Create WebSocket server as well.
   this._wss = new WebSocketServer({ path: path, server: server});
 
-  this._wss.on('connection', function(socket) {
-    var query = url.parse(socket.upgradeReq.url, true).query;
+  this._wss.on('connection', function(socket, req) {
+    var query = url.parse(req.url, true).query;
     var id = query.id;
     var token = query.token;
     var key = query.key;
-    var ip = socket.upgradeReq.socket.remoteAddress;
+    var ip = req.socket.remoteAddress;
 
     if (!id || !token || !key) {
       socket.send(JSON.stringify({ type: 'ERROR', payload: { msg: 'No id, token, or key supplied to websocket server' } }));