diff --git a/CyanEmu/Scripts/CyanEmuPlayerManager.cs b/CyanEmu/Scripts/CyanEmuPlayerManager.cs
index eda8bb1..2be77f3 100644
--- a/CyanEmu/Scripts/CyanEmuPlayerManager.cs
+++ b/CyanEmu/Scripts/CyanEmuPlayerManager.cs
@@ -25,7 +25,7 @@ public static void InitializePlayer(VRCPlayerApi player)
 
             playerIDs[player] = id;
             players[id] = player;
-            VRCPlayerApi.AllPlayers.Add(player);
+            player.AddToList();
 
             if (masterID == -1)
             {
@@ -83,8 +83,7 @@ public static void RemovePlayer(VRCPlayerApi player)
         {
             playerIDs.Remove(player);
             players.Remove(player.playerId);
-
-            VRCPlayerApi.AllPlayers.Remove(player);
+            player.RemoveFromList();
             
             if (masterID == player.playerId)
             {