Index: binaries/data/mods/public/simulation/components/UnitAI.js
===================================================================
--- binaries/data/mods/public/simulation/components/UnitAI.js
+++ binaries/data/mods/public/simulation/components/UnitAI.js
@@ -1244,14 +1244,21 @@
 			}
 		},
 
-
 		"IDLE": {
 			"enter": function() {
-				if (this.IsAnimal())
-					this.SetNextState("ANIMAL.IDLE");
-				else
-					this.SetNextState("INDIVIDUAL.IDLE");
-				return true;
+				let cmpFormation = Engine.QueryInterface(this.formationController, IID_Formation);
+				if (cmpFormation)
+				{
+					let animName = cmpFormation.GetFormationAnimation(this.entity, "idle");
+					this.SelectAnimation(animName);
+				}
+
+				// A unit in formation is never idle.
+				if (this.isIdle)
+				{
+					this.isIdle = false;
+					Engine.PostMessage(this.entity, MT_UnitIdleChanged, { "idle": this.isIdle });
+				}
 			},
 		},