diff --git a/srcs/requirements/nestjs/api_back/src/chat/chat.service.ts b/srcs/requirements/nestjs/api_back/src/chat/chat.service.ts
index fe9333d0..c2992c8d 100644
--- a/srcs/requirements/nestjs/api_back/src/chat/chat.service.ts
+++ b/srcs/requirements/nestjs/api_back/src/chat/chat.service.ts
@@ -536,7 +536,10 @@ export class ChatService {
 			}
 		}
 
-		socket.to(socket.room).emit('message', socket.username, message);
+		console.log("socket rooms:", socket.rooms);
+		let socket_name = `${socket.username}_not_emit`;
+		console.log("socket_name:", socket_name);
+		await socket.to(socket.room).except(socket_name).emit('message', socket.username, message);
 		await this.addMessageToRoom(room_name, socket.username, message);
 
 		printCaller("-- out ");
@@ -561,7 +564,7 @@ export class ChatService {
 		socket.join(room_name);
 		socket.room = room_name;
 		let message = `${socket.username} joined the room`;
-		await socket.to(socket.room).except(`${socket.username}_not_emit`).emit('message', "SERVER", message);
+		await socket.to(socket.room).emit('message', "SERVER", message);
 		await this.addMessageToRoom(room_name, "SERVER", message);
 
 		printCaller("-- out ");