diff --git a/src/Core/Client.cs b/src/Core/Client.cs
index e7838e3..f736b91 100644
--- a/src/Core/Client.cs
+++ b/src/Core/Client.cs
@@ -64,8 +64,8 @@ public class Client {
         lock(ClientLock) {
             LeaveRoom();
             PlayerData.IsValid = false;
-            Room.AddClient(this);
             Room = room;
+            Room.AddClient(this);
         }
         Send(Room.SubscribeRoom());
         UpdatePlayerUserVariables();