diff --git a/src/Game/Systems/PlayerSpawnSystem.cpp b/src/Game/Systems/PlayerSpawnSystem.cpp
index ac0ecdf3..e43cee13 100644
--- a/src/Game/Systems/PlayerSpawnSystem.cpp
+++ b/src/Game/Systems/PlayerSpawnSystem.cpp
@@ -175,8 +175,15 @@ bool PlayerSpawnSystem::OnPlayerDeath(Events::PlayerDeath& e)
     if ((ComponentInfo::EnumType)cTeam["Team"] == cTeam["Team"].Enum("Spectator")) {
         return false;
     }
+
+    if (m_PlayerIDs.count(e.Player.ID) == 0) {
+        return false;
+    }
+
     SpawnRequest req;
     req.PlayerID = m_PlayerIDs.at(e.Player.ID);
     req.Team = cTeam["Team"];
     m_SpawnRequests.push_back(req);
+
+    return true;
 }