diff --git a/lib/socket.js b/lib/socket.js
index 9a96929728..4e97eb55dd 100644
--- a/lib/socket.js
+++ b/lib/socket.js
@@ -116,7 +116,7 @@ Socket.prototype.buildHandshake = function(query){
   function buildQuery(){
     var requestQuery = url.parse(self.request.url, true).query;
     //if socket-specific query exist, replace query strings in requestQuery
-    return Object.assign({}, query, requestQuery);
+    return Object.assign({}, requestQuery, query);
   }
   return {
     headers: this.request.headers,
diff --git a/package.json b/package.json
index 3d648fec14..15bdd27f33 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "socket.io",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "description": "node.js realtime framework server",
   "keywords": [
     "realtime",