diff --git a/OpenRA.Mods.Common/Traits/Attack/AttackFollow.cs b/OpenRA.Mods.Common/Traits/Attack/AttackFollow.cs
index c9686ff459..d6611aba38 100644
--- a/OpenRA.Mods.Common/Traits/Attack/AttackFollow.cs
+++ b/OpenRA.Mods.Common/Traits/Attack/AttackFollow.cs
@@ -30,6 +30,12 @@ namespace OpenRA.Mods.Common.Traits
 
 		public virtual void Tick(Actor self)
 		{
+			if (IsTraitDisabled)
+			{
+				Target = Target.Invalid;
+				return;
+			}
+
 			DoAttack(self, Target);
 			IsAttacking = Target.IsValidFor(self);
 		}