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
@@ -1015,8 +1015,10 @@
 				if (!cmpFormation)
 					return;
 
-				if (this.TestAllMemberFunction("IsIdle"))
+				if (this.TestAllMemberFunction("IsIdle")) {
 					cmpFormation.MoveMembersIntoFormation(false, false);
+					this.StopTimer();
+				}
 			},
 
 		},