diff --git a/ChatApp/src/server/ServerConnexion.java b/ChatApp/src/server/ServerConnexion.java
index a38d456..533c85e 100644
--- a/ChatApp/src/server/ServerConnexion.java
+++ b/ChatApp/src/server/ServerConnexion.java
@@ -47,6 +47,10 @@ public class ServerConnexion implements PacketVisitor {
 
 	@Override
 	public void visitPacket(JoinRoomPacket packet) {
+		if(server.getRoomName(this) != null) {
+			server.leaveRoom(this);
+			return;
+		}
 		boolean joined = server.joinRoom(packet.getRoomName(), this);
 		sendPacket(new ServerResponsePacket(joined ? Response.RoomJoined : Response.RoomNotJoined));
 		if (joined)