diff --git a/Assets/Scripts/BuildingManager.cs b/Assets/Scripts/BuildingManager.cs
index 68dbe94..eaf48b5 100644
--- a/Assets/Scripts/BuildingManager.cs
+++ b/Assets/Scripts/BuildingManager.cs
@@ -438,14 +438,17 @@ namespace Northbound
         private TeamType GetPlayerTeam(ulong playerId)
         {
             // 플레이어의 NetworkObject 찾기
-            if (NetworkManager.Singleton != null && NetworkManager.Singleton.SpawnManager != null)
+            if (NetworkManager.Singleton != null && NetworkManager.Singleton.ConnectedClients != null)
             {
-                if (NetworkManager.Singleton.SpawnManager.SpawnedObjects.TryGetValue(playerId, out NetworkObject playerNetObj))
+                if (NetworkManager.Singleton.ConnectedClients.TryGetValue(playerId, out var client))
                 {
-                    var teamMember = playerNetObj.GetComponent<ITeamMember>();
-                    if (teamMember != null)
+                    if (client.PlayerObject != null)
                     {
-                        return teamMember.GetTeam();
+                        var teamMember = client.PlayerObject.GetComponent<ITeamMember>();
+                        if (teamMember != null)
+                        {
+                            return teamMember.GetTeam();
+                        }
                     }
                 }
             }