diff --git a/api/src/main/java/com/alttd/chat/database/Queries.java b/api/src/main/java/com/alttd/chat/database/Queries.java
index db9bcfd..33a4707 100755
--- a/api/src/main/java/com/alttd/chat/database/Queries.java
+++ b/api/src/main/java/com/alttd/chat/database/Queries.java
@@ -373,7 +373,7 @@ public class Queries {
                 String toggledChannel = resultSet.getString("toggled_channel");
                 Channel channel = toggledChannel == null ? null : Channel.getChatChannel(toggledChannel);
                 user = new ChatUser(uuid, partyId, channel);
-                ChatUserManager.addUser(user);
+//                ChatUserManager.addUser(user);
             }
 
         } catch (SQLException e) {
diff --git a/api/src/main/java/com/alttd/chat/managers/ChatUserManager.java b/api/src/main/java/com/alttd/chat/managers/ChatUserManager.java
index 0fc1b42..a0bc1f7 100755
--- a/api/src/main/java/com/alttd/chat/managers/ChatUserManager.java
+++ b/api/src/main/java/com/alttd/chat/managers/ChatUserManager.java
@@ -20,15 +20,9 @@ public final class ChatUserManager {
     }
 
     public static void removeUser(ChatUser user) {
-        chatUsers.remove(user);
+        chatUsers.remove(user.getUuid());
     }
 
-    /**
-     * Get the ChatUser for this player or query the database to read the data.
-     *
-     * @param uuid the player who's ChatUser you'd like to get
-     * @return The ChatUser loaded from database or null if it's not existing.
-     */
     public static ChatUser getChatUser(UUID uuid) {
         return chatUsers.computeIfAbsent(uuid, k -> Queries.loadChatUser(uuid));
     }