diff --git a/src/main/java/land/chipmunk/chipmunkmod/modules/Players.java b/src/main/java/land/chipmunk/chipmunkmod/modules/Players.java
index 369dfe8..8116c8b 100644
--- a/src/main/java/land/chipmunk/chipmunkmod/modules/Players.java
+++ b/src/main/java/land/chipmunk/chipmunkmod/modules/Players.java
@@ -179,10 +179,11 @@ public class Players extends Listener {
                     return packet;
                 }
 
-                removeFromPlayerList(uuid);
-
                 list.remove(target);
 
+                // TODO: fix players using /username gone from the player list, the cause is exactly at the next line and it's because uuid i guess
+                removeFromPlayerList(uuid);
+
                 return packet;
             });
         } catch (Exception e) {