diff --git a/OpenRa.Game/Combat.cs b/OpenRa.Game/Combat.cs
index 5f651d6e7b..ea855f1f38 100644
--- a/OpenRa.Game/Combat.cs
+++ b/OpenRa.Game/Combat.cs
@@ -57,8 +57,12 @@ namespace OpenRa.Game
 		public static bool WeaponValidForTarget(WeaponInfo weapon, Actor target)
 		{
 			var projectile = Rules.ProjectileInfo[weapon.Projectile];
+			var warhead = Rules.WarheadInfo[weapon.Warhead];
 			var unit = target.traits.GetOrDefault<Unit>();
 
+			if (warhead.EffectivenessAgainst(target.Info.Armor) <= 0)
+				return false;
+
 			if (target.traits.Contains<Submarine>())
 				return projectile.ASW;