diff --git a/Source/Services/Room.js b/Source/Services/Room.js
index c92bf8f..7711814 100644
--- a/Source/Services/Room.js
+++ b/Source/Services/Room.js
@@ -244,10 +244,11 @@ addService(({
         case 'joinroom':{
             let {name} = message;
             let roomId;
-            for (const [roomId,{name:RoomName}] of Room.rooms) {
+            for (const [_roomId,{name:RoomName}] of Room.rooms) {
                 if(name == RoomName)
                 {
-                    roomId = roomId
+                    roomId = _roomId
+                    break;
                 }
             }
             let isRoom = Room.rooms.has(roomId);
@@ -272,6 +273,7 @@ addService(({
                     })
                 }else if(room.joinType == "free"){
                     room.join(client);
+                    return end({status : "success"})
                 }else if(room.joinType == "invite"){
                     room.waitingInvited.add(client.id);
                     if(room.notifyActionInvite)
diff --git a/test.html b/test.html
index d63ba37..8b6eca8 100644
--- a/test.html
+++ b/test.html
@@ -15,7 +15,7 @@
             let secretRoom;
             console.log("Connected ws")
             let roomInfo = await ws.roomInfo("MY-ROOM");
-
+            console.log("Room  Info", roomInfo)
             if(roomInfo.status == 'fail' && roomInfo.message == "NOT-FOUND-ROOM")
             {
                 let secretRoom = await ws.createRoom({
@@ -23,9 +23,10 @@
                     description: "Gizli Odam",
                     joinType: "free"
                 });
-                console.log(secretRoom);
+                console.log("CreateRoom",secretRoom);
             }else{
-                
+                let joinedRoom = await ws.joinRoom("MY-ROOM");
+                console.log("JoinRoom",joinedRoom);
             }
 
             console.log(await ws.getJoinedRooms());