diff --git a/OpenRA.Mods.Common/Traits/Render/WithMoveAnimation.cs b/OpenRA.Mods.Common/Traits/Render/WithMoveAnimation.cs
index 464d4386f1..44a6d39698 100644
--- a/OpenRA.Mods.Common/Traits/Render/WithMoveAnimation.cs
+++ b/OpenRA.Mods.Common/Traits/Render/WithMoveAnimation.cs
@@ -73,7 +73,8 @@ namespace OpenRA.Mods.Common.Traits.Render
 
 		protected override void TraitEnabled(Actor self)
 		{
-			UpdateAnimation(self, movement.CurrentMovementTypes);
+			// HACK: Use a FrameEndTask to avoid construction order issues with WithSpriteBody
+			self.World.AddFrameEndTask(w => UpdateAnimation(self, movement.CurrentMovementTypes));
 		}
 
 		protected override void TraitDisabled(Actor self)