diff --git a/utilities/servers/websocket.js b/utilities/servers/websocket.js
index c902f1b9d..e23002246 100644
--- a/utilities/servers/websocket.js
+++ b/utilities/servers/websocket.js
@@ -12,32 +12,35 @@ const AGENT_DISCONNECT = "AGENT_DISCONNECTED";
 const AGENTS_CONNECTED = "AGENTS_CONNECTED";
 const NO_SESSIONS = "SESSION_DISCONNECTED";
 const SESSION_ALREADY_CONNECTED = "SESSION_ALREADY_CONNECTED";
-// const wsReconnectionTimeout = process.env.wsReconnectionTimeout | 10 * 1000;
 
 let io;
 let debug = process.env.debug === "1" || false;
+const extractUserIdFromRequest = function (req) {
+    if (req.query.userId) {
+        debug && console.log(`[WS]where userId=${req.query.userId}`);
+        return req.query.userId;
+    }
+    return undefined;
+}
+
 
 const socketsList = async function (req, res) {
     debug && console.log("[WS]looking for all available sessions");
-    let userId;
-    if (req.query.userId) {
-        debug && console.log(`[WS]where userId=${req.query.userId}`);
-        userId = req.query.userId;
-    }
+    let userId = extractUserIdFromRequest(req);
+
     let liveSessions = {};
     for (let peerId of io.sockets.adapter.rooms.keys()) {
         let {projectKey, sessionId} = extractPeerId(peerId);
         if (projectKey !== undefined) {
+            liveSessions[projectKey] = liveSessions[projectKey] || [];
             if (userId) {
                 const connected_sockets = await io.in(peerId).fetchSockets();
                 for (let item of connected_sockets) {
                     if (item.handshake.query.identity === IDENTITIES.session && item.handshake.query.sessionInfo && item.handshake.query.sessionInfo.userID === userId) {
-                        liveSessions[projectKey] = liveSessions[projectKey] || [];
                         liveSessions[projectKey].push(sessionId);
                     }
                 }
             } else {
-                liveSessions[projectKey] = liveSessions[projectKey] || [];
                 liveSessions[projectKey].push(sessionId);
             }
         }
@@ -50,25 +53,20 @@ wsRouter.get(`/${process.env.S3_KEY}/sockets-list`, socketsList);
 
 const socketsListByProject = async function (req, res) {
     debug && console.log(`[WS]looking for available sessions for ${req.params.projectKey}`);
-    let userId;
-    if (req.query.userId) {
-        debug && console.log(`[WS]where userId=${req.query.userId}`);
-        userId = req.query.userId;
-    }
+    let userId = extractUserIdFromRequest(req);
     let liveSessions = {};
     for (let peerId of io.sockets.adapter.rooms.keys()) {
         let {projectKey, sessionId} = extractPeerId(peerId);
         if (projectKey === req.params.projectKey) {
+            liveSessions[projectKey] = liveSessions[projectKey] || [];
             if (userId) {
                 const connected_sockets = await io.in(peerId).fetchSockets();
                 for (let item of connected_sockets) {
                     if (item.handshake.query.identity === IDENTITIES.session && item.handshake.query.sessionInfo && item.handshake.query.sessionInfo.userID === userId) {
-                        liveSessions[projectKey] = liveSessions[projectKey] || [];
                         liveSessions[projectKey].push(sessionId);
                     }
                 }
             } else {
-                liveSessions[projectKey] = liveSessions[projectKey] || [];
                 liveSessions[projectKey].push(sessionId);
             }
         }
@@ -81,11 +79,7 @@ wsRouter.get(`/${process.env.S3_KEY}/sockets-list/:projectKey`, socketsListByPro
 
 const socketsLive = async function (req, res) {
     debug && console.log("[WS]looking for all available LIVE sessions");
-    let userId;
-    if (req.query.userId) {
-        debug && console.log(`[WS]where userId=${req.query.userId}`);
-        userId = req.query.userId;
-    }
+    let userId = extractUserIdFromRequest(req);
     let liveSessions = {};
     for (let peerId of io.sockets.adapter.rooms.keys()) {
         let {projectKey, sessionId} = extractPeerId(peerId);
@@ -93,13 +87,12 @@ const socketsLive = async function (req, res) {
             let connected_sockets = await io.in(peerId).fetchSockets();
             for (let item of connected_sockets) {
                 if (item.handshake.query.identity === IDENTITIES.session) {
+                    liveSessions[projectKey] = liveSessions[projectKey] || [];
                     if (userId) {
                         if (item.handshake.query.sessionInfo && item.handshake.query.sessionInfo.userID === userId) {
-                            liveSessions[projectKey] = liveSessions[projectKey] || [];
                             liveSessions[projectKey].push(item.handshake.query.sessionInfo);
                         }
                     } else {
-                        liveSessions[projectKey] = liveSessions[projectKey] || [];
                         liveSessions[projectKey].push(item.handshake.query.sessionInfo);
                     }
                 }
@@ -115,11 +108,7 @@ wsRouter.get(`/${process.env.S3_KEY}/sockets-live`, socketsLive);
 
 const socketsLiveByProject = async function (req, res) {
     debug && console.log(`[WS]looking for available LIVE sessions for ${req.params.projectKey}`);
-    let userId;
-    if (req.query.userId) {
-        debug && console.log(`[WS]where userId=${req.query.userId}`);
-        userId = req.query.userId;
-    }
+    let userId = extractUserIdFromRequest(req);
     let liveSessions = {};
     for (let peerId of io.sockets.adapter.rooms.keys()) {
         let {projectKey, sessionId} = extractPeerId(peerId);
@@ -127,13 +116,12 @@ const socketsLiveByProject = async function (req, res) {
             let connected_sockets = await io.in(peerId).fetchSockets();
             for (let item of connected_sockets) {
                 if (item.handshake.query.identity === IDENTITIES.session) {
+                    liveSessions[projectKey] = liveSessions[projectKey] || [];
                     if (userId) {
                         if (item.handshake.query.sessionInfo && item.handshake.query.sessionInfo.userID === userId) {
-                            liveSessions[projectKey] = liveSessions[projectKey] || [];
                             liveSessions[projectKey].push(item.handshake.query.sessionInfo);
                         }
                     } else {
-                        liveSessions[projectKey] = liveSessions[projectKey] || [];
                         liveSessions[projectKey].push(item.handshake.query.sessionInfo);
                     }
                 }