diff --git a/apps/server/src/domains/room/application/useCases/joinRoomUseCase.ts b/apps/server/src/domains/room/application/useCases/joinRoomUseCase.ts
index e432db4..ecca7bd 100644
--- a/apps/server/src/domains/room/application/useCases/joinRoomUseCase.ts
+++ b/apps/server/src/domains/room/application/useCases/joinRoomUseCase.ts
@@ -42,14 +42,6 @@
   }
 
   publishRoomUpdate(roomId, joinResult.room);
-  logEvent("RoomUseCase", {
-    event: "ROOM_UPDATE",
-    result: "emitted",
-    roomId,
-    socketId,
-    ownerId: joinResult.room.ownerId,
-    totalPlayers: joinResult.room.players.length,
-  });
 
   return joinResult;
 };
diff --git a/apps/server/src/network/handlers/room/registerRoomHandlers.ts b/apps/server/src/network/handlers/room/registerRoomHandlers.ts
index f3e66be..d1000ce 100644
--- a/apps/server/src/network/handlers/room/registerRoomHandlers.ts
+++ b/apps/server/src/network/handlers/room/registerRoomHandlers.ts
@@ -74,9 +74,15 @@
 
       case "joined":
         socket.join(roomId);
-        if (joinedRoom) {
-          roomPublisher.publishRoomUpdate(roomId, joinedRoom);
-        }
+        roomPublisher.publishRoomUpdate(roomId, joinResult.room);
+        logEvent("RoomUseCase", {
+          event: "ROOM_UPDATE",
+          result: "emitted",
+          roomId,
+          socketId: socket.id,
+          ownerId: joinResult.room.ownerId,
+          totalPlayers: joinResult.room.players.length,
+        });
         return;
 
       default: