diff --git a/OpenRA.Game/Traits/Health.cs b/OpenRA.Game/Traits/Health.cs
index 60de490a80..89c1add7b3 100755
--- a/OpenRA.Game/Traits/Health.cs
+++ b/OpenRA.Game/Traits/Health.cs
@@ -156,7 +156,9 @@ namespace OpenRA.Traits
 		}
 				
 		public static DamageState GetDamageState(this Actor self)
-		{
+		{
+			if (self.Destroyed) return DamageState.Dead;
+
 			var health = self.TraitOrDefault<Health>();
 			return (health == null) ? DamageState.Undamaged : health.DamageState;
 		}