diff --git a/assist/servers/websocket.js b/assist/servers/websocket.js
index 6dbb5bf21..f146057e0 100644
--- a/assist/servers/websocket.js
+++ b/assist/servers/websocket.js
@@ -345,11 +345,10 @@ module.exports = {
                 }
                 Object.assign(socket.handshake.query.sessionInfo, args[0].data, {tabId: args[0].meta.tabId});
                 socket.to(socket.roomId).emit(EVENTS_DEFINITION.emit.UPDATE_EVENT, args[0]);
-                // Update sessionInfo for all sessions (TODO: rewrite this)
+                // Update sessionInfo for all sessions in room
                 const rooms = await getAvailableRooms(io);
                 for (let roomId of rooms.keys()) {
-                    let {projectKey} = extractPeerId(roomId);
-                    if (projectKey === connProjectKey) {
+                    if (roomId === socket.roomId) {
                         const connected_sockets = await io.in(roomId).fetchSockets();
                         for (let item of connected_sockets) {
                             if (item.handshake.query.identity === IDENTITIES.session && item.handshake.query.sessionInfo) {
diff --git a/ee/assist/servers/websocket-cluster.js b/ee/assist/servers/websocket-cluster.js
index a03d582c1..4cad9dcb1 100644
--- a/ee/assist/servers/websocket-cluster.js
+++ b/ee/assist/servers/websocket-cluster.js
@@ -398,11 +398,10 @@ module.exports = {
                 }
                 Object.assign(socket.handshake.query.sessionInfo, args[0].data, {tabId: args[0].meta.tabId});
                 socket.to(socket.roomId).emit(EVENTS_DEFINITION.emit.UPDATE_EVENT, args[0]);
-                // Update sessionInfo for all sessions (TODO: rewrite this)
+                // Update sessionInfo for all sessions in room
                 const rooms = await getAvailableRooms(io);
                 for (let roomId of rooms.keys()) {
-                    let {projectKey} = extractPeerId(roomId);
-                    if (projectKey === connProjectKey) {
+                    if (roomId === socket.roomId) {
                         const connected_sockets = await io.in(roomId).fetchSockets();
                         for (let item of connected_sockets) {
                             if (item.handshake.query.identity === IDENTITIES.session && item.handshake.query.sessionInfo) {
diff --git a/ee/assist/servers/websocket.js b/ee/assist/servers/websocket.js
index 255d3e5be..4411593e4 100644
--- a/ee/assist/servers/websocket.js
+++ b/ee/assist/servers/websocket.js
@@ -366,11 +366,10 @@ module.exports = {
                 }
                 Object.assign(socket.handshake.query.sessionInfo, args[0].data, {tabId: args[0].meta.tabId});
                 socket.to(socket.roomId).emit(EVENTS_DEFINITION.emit.UPDATE_EVENT, args[0]);
-                // Update sessionInfo for all sessions (TODO: rewrite this)
+                // Update sessionInfo for all sessions in room
                 const rooms = await getAvailableRooms(io);
                 for (let roomId of rooms.keys()) {
-                    let {projectKey} = extractPeerId(roomId);
-                    if (projectKey === connProjectKey) {
+                    if (roomId === socket.roomId) {
                         const connected_sockets = await io.in(roomId).fetchSockets();
                         for (let item of connected_sockets) {
                             if (item.handshake.query.identity === IDENTITIES.session && item.handshake.query.sessionInfo) {