diff --git a/TABGVR.Server/Patches/PlayerNewSpawnPatch.cs b/TABGVR.Server/Patches/PlayerNewSpawnPatch.cs
index e5a70a1..10270d2 100644
--- a/TABGVR.Server/Patches/PlayerNewSpawnPatch.cs
+++ b/TABGVR.Server/Patches/PlayerNewSpawnPatch.cs
@@ -17,7 +17,7 @@ public static void Postfix(ServerClient world, TABGPlayerServer player)
     {
         world.WaitThenDoAction(3, () =>
         {
-            var store = new PlayerStore(world.GameRoomReference.FindPlayer(player.PlayerIndex)); // Create PlayerStore
+            var store = new PlayerStore(player); // Create PlayerStore
 
             store.Identification = new(store, world);
             store.Identification.Interrogate();