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
@@ -4523,6 +4523,11 @@
  */
 UnitAI.prototype.ShouldAbandonChase = function(target, force, iid, type)
 {
+	// Abandon chase when the target garrisons, for else we will keep on walking.
+	let cmpTargetUnitAI = Engine.QueryInterface(target, IID_UnitAI);
+	if (cmpTargetUnitAI && cmpTargetUnitAI.IsGarrisoned() && !cmpTargetUnitAI.IsTurret())
+		return true;
+
 	// Forced orders shouldn't be interrupted.
 	if (force)
 		return false;