diff --git a/utilities/servers/websocket.js b/utilities/servers/websocket.js
index 5057d5d9f..262392d25 100644
--- a/utilities/servers/websocket.js
+++ b/utilities/servers/websocket.js
@@ -2,10 +2,11 @@ const _io = require('socket.io');
 var express = require('express');
 var {extractPeerId} = require('./peerjs-server');
 var wsRouter = express.Router();
-const IDENTITIES = {assist: 'agent', session: 'session'};
-const NEW_ASSIST_MESSAGE = "NEW_AGENT";
-const NO_ASSISTS = "NO_AGENT";
+const IDENTITIES = {agent: 'agent', session: 'session'};
+const NEW_AGENT_MESSAGE = "NEW_AGENT";
+const NO_AGENTS = "NO_AGENT";
 const NO_SESSIONS = "SESSION_DISCONNECTED";
+const SESSION_ALREADY_CONNECTED = "SESSION_ALREADY_CONNECTED";
 const wsReconnectionTimeout = process.env.wsReconnectionTimeout | 10 * 1000;
 
 let connectedSessions = {};
@@ -29,7 +30,17 @@ const removeSession = (projectKey, sessionId) => {
     if (i !== -1) {
         connectedSessions[projectKey].splice(i, 1);
     }
-}
+};
+
+const findSessionSocketId = async (io, peerId) => {
+    const connected_sockets = await io.in(peerId).fetchSockets();
+    for (let item of connected_sockets) {
+        if (item.handshake.query.identity === IDENTITIES.session) {
+            return item.id;
+        }
+    }
+    return null;
+};
 
 module.exports = {
     wsRouter,
@@ -42,7 +53,7 @@ module.exports = {
             path: '/socket'
         });
 
-        io.on('connection', (socket) => {
+        io.on('connection', async (socket) => {
             console.log(`WS started:${socket.id}, Query:${JSON.stringify(socket.handshake.query)}`);
             socket.peerId = socket.handshake.query.peerId;
             socket.identity = socket.handshake.query.identity;
@@ -55,6 +66,12 @@ module.exports = {
                 if (!connectedSessions[socket.projectKey].includes(socket.sessionId)) {
                     connectedSessions[socket.projectKey].push(socket.sessionId);
                 }
+                let sessionSocketId = await findSessionSocketId(io, socket.peerId);
+                if (sessionSocketId !== null) {
+                    console.log(`session already connected, refusing new connexion`);
+                    io.to(socket.id).emit(SESSION_ALREADY_CONNECTED);
+                    return socket.disconnect();
+                }
             }
             socket.join(socket.peerId);
             if (io.sockets.adapter.rooms.get(socket.peerId)) {
@@ -66,15 +83,15 @@ module.exports = {
                 console.log(`${socket.id} disconnected from ${socket.peerId}`);
                 // wait a little bit before notifying everyone
                 // setTimeout(async () => {
-                console.log("wait ended, checking for number of connected assistants and sessions");
+                console.log("wait ended, checking for number of connected agentants and sessions");
                 if (io.sockets.adapter.rooms.get(socket.peerId)) {
                     const connected_sockets = await io.in(socket.peerId).fetchSockets();
-                    let c_sessions = 0, c_assistants = 0;
+                    let c_sessions = 0, c_agentants = 0;
                     for (let item of connected_sockets) {
                         if (item.handshake.query.identity === IDENTITIES.session) {
                             c_sessions++;
                         } else {
-                            c_assistants++;
+                            c_agentants++;
                         }
                     }
                     if (c_sessions === 0) {
@@ -82,9 +99,9 @@ module.exports = {
                         socket.to(socket.peerId).emit(NO_SESSIONS);
                         removeSession(socket.projectKey, socket.sessionId);
                     }
-                    if (c_assistants === 0) {
-                        console.log(`notifying everyone in ${socket.peerId} about no ASSISNTANT`);
-                        socket.to(socket.peerId).emit(NO_ASSISTS);
+                    if (c_agentants === 0) {
+                        console.log(`notifying everyone in ${socket.peerId} about no AGENTS`);
+                        socket.to(socket.peerId).emit(NO_AGENTS);
                     }
                 } else {
                     console.log(`room not found: ${socket.peerId}`);
@@ -93,18 +110,26 @@ module.exports = {
                 // }, wsReconnectionTimeout);
             });
 
-            socket.onAny((eventName, ...args) => {
+            socket.onAny(async (eventName, ...args) => {
                 socket.lastMessageReceivedAt = Date.now();
-                console.log("received event:" + eventName + ", from:" + socket.identity + ", sending message to room:" + socket.peerId + ", size:" + io.sockets.adapter.rooms.get(socket.peerId).size);
-                if(socket.identity===IDENTITIES.session){
+                if (socket.identity === IDENTITIES.session) {
+                    console.log(`received event:${eventName}, from:${socket.identity}, sending message to room:${socket.peerId}, size: ${io.sockets.adapter.rooms.get(socket.peerId).size}`);
                     socket.to(socket.peerId).emit(eventName, args[0]);
-                }else{
-
+                } else {
+                    console.log(`received event:${eventName}, from:${socket.identity}, sending message to session of room:${socket.peerId}, size:${io.sockets.adapter.rooms.get(socket.peerId).size}`);
+                    let socketId = await findSessionSocketId(io, socket.peerId);
+                    if (socketId === null) {
+                        console.log(`session not found for:${socket.peerId}`);
+                        io.to(socket.id).emit(NO_SESSIONS);
+                    } else {
+                        console.log("message sent");
+                        io.to(socketId).emit(eventName, args[0]);
+                    }
                 }
             });
 
-            if (socket.identity === IDENTITIES.assist) {
-                socket.to(socket.peerId).emit(NEW_ASSIST_MESSAGE);
+            if (socket.identity === IDENTITIES.agent) {
+                socket.to(socket.peerId).emit(NEW_AGENT_MESSAGE);
             }
         });
     }