diff --git a/OpenRA.Mods.Common/Traits/AutoTarget.cs b/OpenRA.Mods.Common/Traits/AutoTarget.cs
index 9fbdc2a495..d299d2c294 100644
--- a/OpenRA.Mods.Common/Traits/AutoTarget.cs
+++ b/OpenRA.Mods.Common/Traits/AutoTarget.cs
@@ -256,6 +256,15 @@ namespace OpenRA.Mods.Common.Traits
 			if (attacker.AppearsFriendlyTo(self))
 				return;
 
+			// Respect AutoAttack priorities.
+			if (stance > UnitStance.ReturnFire)
+			{
+				var autoTarget = ScanForTarget(self, allowMove, true);
+
+				if (autoTarget != Target.Invalid)
+					attacker = autoTarget.Actor;
+			}
+
 			Aggressor = attacker;
 
 			Attack(Target.FromActor(Aggressor), allowMove);