diff --git a/OpenRA.Game/Traits/Attack/AttackBase.cs b/OpenRA.Game/Traits/Attack/AttackBase.cs
index 2d03b67882..d2d4ed8afb 100755
--- a/OpenRA.Game/Traits/Attack/AttackBase.cs
+++ b/OpenRA.Game/Traits/Attack/AttackBase.cs
@@ -69,8 +69,9 @@ namespace OpenRA.Traits
 
 		protected virtual bool CanAttack(Actor self)
 		{
-			if( target == null ) return false;
-			if( ( primaryFireDelay > 0 ) && ( secondaryFireDelay > 0 ) ) return false;
+			if (target == null) return false;
+			if ((primaryFireDelay > 0) && (secondaryFireDelay > 0)) return false;
+			if (self.traits.WithInterface<IDisable>().Any(d => d.Disabled)) return false;
 
 			return true;
 		}