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
@@ -4945,6 +4945,11 @@
 
 UnitAI.prototype.AddOrder = function(type, data, queued)
 {
+	// May happen only if an order arrives on the same turn the unit is garrisoned
+	// in that case, just forget the order as this will lead to a weird state
+	if (this.IsGarrisoned() && !this.IsTurret() && type != "Ungarrison")
+		return;
+
 	if (this.expectedRoute)
 		this.expectedRoute = undefined;