diff --git a/src/game/server/neo/neo_player.cpp b/src/game/server/neo/neo_player.cpp
index d75a80409..be0f5e675 100644
--- a/src/game/server/neo/neo_player.cpp
+++ b/src/game/server/neo/neo_player.cpp
@@ -2894,8 +2894,11 @@ CBaseEntity* CNEO_Player::EntSelectSpawnPoint( void )
 	const bool bIsTeamplay = NEORules()->IsTeamplay();
 	if (!bIsTeamplay)
 	{
-		pSpawnpointName = "info_player_deathmatch";
-		pLastSpawnPoint = g_pLastSpawn;
+		if (GetTeamNumber() > LAST_SHARED_TEAM)
+		{
+			pSpawnpointName = "info_player_deathmatch";
+			pLastSpawnPoint = g_pLastSpawn;
+		}
 	}
 	else
 	{