diff --git a/OpenRA.Mods.Common/Traits/BotModules/BuildingRepairBotModule.cs b/OpenRA.Mods.Common/Traits/BotModules/BuildingRepairBotModule.cs
index 4dc73656c0..644bd7bf51 100644
--- a/OpenRA.Mods.Common/Traits/BotModules/BuildingRepairBotModule.cs
+++ b/OpenRA.Mods.Common/Traits/BotModules/BuildingRepairBotModule.cs
@@ -28,8 +28,8 @@ namespace OpenRA.Mods.Common.Traits
 		{
 			// HACK: We don't want D2k bots to repair all their buildings on placement
 			// where half their HP is removed via neutral terrain damage.
-			// TODO: Implement concrete placement for D2k bots and remove this hack.
-			if (self.Owner.RelationshipWith(e.Attacker.Owner) == PlayerRelationship.Neutral)
+			// TODO: Implement concrete placement for D2k bots and remove this hack on players relationship check.
+			if (self.IsDead || self.Owner.RelationshipWith(e.Attacker.Owner) == PlayerRelationship.Neutral)
 				return;
 
 			var rb = self.TraitOrDefault<RepairableBuilding>();