diff --git a/OpenRA.Mods.Common/Traits/Render/WithInfantryBody.cs b/OpenRA.Mods.Common/Traits/Render/WithInfantryBody.cs
index 710384e2b5..646968b055 100644
--- a/OpenRA.Mods.Common/Traits/Render/WithInfantryBody.cs
+++ b/OpenRA.Mods.Common/Traits/Render/WithInfantryBody.cs
@@ -160,6 +160,10 @@ namespace OpenRA.Mods.Common.Traits.Render
 
 		protected virtual void Tick(Actor self)
 		{
+			// Attacking takes care of reverting back to PlayStandAnimation
+			if (state == AnimationState.Attacking)
+				return;
+
 			if (rsm != null)
 			{
 				if (wasModifying != rsm.IsModifyingSequence)