diff --git a/OpenRA.Mods.Common/Activities/Attack.cs b/OpenRA.Mods.Common/Activities/Attack.cs
index 9c0ebadd34..15dbfa1295 100644
--- a/OpenRA.Mods.Common/Activities/Attack.cs
+++ b/OpenRA.Mods.Common/Activities/Attack.cs
@@ -155,6 +155,12 @@ namespace OpenRA.Mods.Common.Activities
 			return true;
 		}
 
+		protected override void OnLastRun(Actor self)
+		{
+			foreach (var attack in attackTraits)
+				attack.IsAiming = false;
+		}
+
 		protected virtual AttackStatus TickAttack(Actor self, AttackFrontal attack)
 		{
 			if (!target.IsValidFor(self))