diff --git a/core/src/com/unciv/logic/trade/TradeLogic.kt b/core/src/com/unciv/logic/trade/TradeLogic.kt
index 91ffb1e9fa..2327eb7559 100644
--- a/core/src/com/unciv/logic/trade/TradeLogic.kt
+++ b/core/src/com/unciv/logic/trade/TradeLogic.kt
@@ -88,7 +88,14 @@ class TradeLogic(val ourCivilization:CivilizationInfo, val otherCivilization: Ci
                 if (offer.type == TradeType.City) {
                     val city = from.cities.first { it.id == offer.name }
                     city.moveToCiv(to)
-                    city.getCenterTile().getUnits().toList().forEach { it.movement.teleportToClosestMoveableTile() }
+                    city.getCenterTile().getUnits().forEach { it.movement.teleportToClosestMoveableTile() }
+                    city.getTiles().forEach{ tile ->
+                        tile.getUnits().forEach{ unit ->
+                            if (!unit.civInfo.canEnterTiles(to)) {
+                                unit.movement.teleportToClosestMoveableTile()
+                            }
+                        }
+                    }
                     to.updateViewableTiles()
                     from.updateViewableTiles()
                 }