diff --git a/core/src/com/unciv/logic/automation/unit/UnitAutomation.kt b/core/src/com/unciv/logic/automation/unit/UnitAutomation.kt
index f0c9e507df7da..2a32ddde261ce 100644
--- a/core/src/com/unciv/logic/automation/unit/UnitAutomation.kt
+++ b/core/src/com/unciv/logic/automation/unit/UnitAutomation.kt
@@ -333,7 +333,8 @@ object UnitAutomation {
                 }
                 if (unit.movement.canUnitSwapTo(retreatTile)) {
                     unit.movement.headTowards(retreatTile) // we need to move through the intermediate tiles
-                    if (unit.currentTile.neighbors.contains(otherUnit.currentTile)) {
+                    // if nothing changed
+                    if (unit.currentTile.neighbors.contains(otherUnit.currentTile) && unit.movement.canUnitSwapTo(retreatTile)) {
                         unit.movement.swapMoveToTile(retreatTile)
                     }
                     return true