diff --git a/regamedll/dlls/multiplay_gamerules.cpp b/regamedll/dlls/multiplay_gamerules.cpp
index 1557c5efa..d81db06f4 100644
--- a/regamedll/dlls/multiplay_gamerules.cpp
+++ b/regamedll/dlls/multiplay_gamerules.cpp
@@ -3844,7 +3844,7 @@ void EXT_FUNC CHalfLifeMultiplay::__API_HOOK(PlayerSpawn)(CBasePlayer *pPlayer)
 		pPlayer->SetSpawnProtection(respawn_immunitytime.value);
 
 	// remove any defusers left over from previous random if there is just one random one
-	if ((int)defuser_allocation.value == DEFUSERALLOCATION_RANDOM)
+	if (m_bMapHasBombTarget && (int)defuser_allocation.value == DEFUSERALLOCATION_RANDOM)
 		pPlayer->RemoveDefuser();
 #endif
 }