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
@@ -5938,9 +5938,8 @@
 
 	this.SetStance(stance);
 	// Stop moving if switching to stand ground
-	// TODO: Also stop existing orders in a sensible way
 	if (stance == "standground")
-		this.StopMoving();
+		this.ReplaceOrder("Stop");
 
 	// Reset the range queries, since the range depends on stance.
 	this.SetupRangeQueries();