diff --git a/src/Game/Systems/PlayerSpawnSystem.cpp b/src/Game/Systems/PlayerSpawnSystem.cpp
index 1ee674cb..e03a1778 100644
--- a/src/Game/Systems/PlayerSpawnSystem.cpp
+++ b/src/Game/Systems/PlayerSpawnSystem.cpp
@@ -19,7 +19,7 @@ void PlayerSpawnSystem::Update(double dt)
     // Should be able to support older maps with this.
     // TODO: In the future we might want to return instead, to avoid spawning in the menu for instance.
     auto pool = m_World->GetComponents("CapturePointGameMode");
-    if (pool != nullptr)
+    if (pool != nullptr && pool->size() > 0)
     {
         // Take the first CapturePointGameMode component found.
         ComponentWrapper& modeComponent = *pool->begin();