diff --git a/OpenRA.Mods.Common/AI/States/StateBase.cs b/OpenRA.Mods.Common/AI/States/StateBase.cs
index 5c4d30c600..a7cdd0818d 100644
--- a/OpenRA.Mods.Common/AI/States/StateBase.cs
+++ b/OpenRA.Mods.Common/AI/States/StateBase.cs
@@ -70,8 +70,13 @@ namespace OpenRA.Mods.Common.AI
 
 			var arms = a.TraitsImplementing<Armament>();
 			foreach (var arm in arms)
+			{
+				if (arm.IsTraitDisabled)
+					continue;
+
 				if (arm.Weapon.IsValidTarget(targetTypes))
 					return true;
+			}
 
 			return false;
 		}