diff --git a/OpenRA.Game/Traits/Mobile.cs b/OpenRA.Game/Traits/Mobile.cs
index 505034cfd8..caddde09a3 100644
--- a/OpenRA.Game/Traits/Mobile.cs
+++ b/OpenRA.Game/Traits/Mobile.cs
@@ -105,8 +105,10 @@ namespace OpenRA.Traits
 		public IEnumerable<int2> OccupiedCells()
 		{
 			return (fromCell == toCell)
-				? new[] { fromCell } 
-				: new[] { fromCell, toCell };
+				? new[] { fromCell }
+				: CanEnterCell(toCell)
+					? new[] { toCell }
+					: new[] { fromCell, toCell };
 		}
 
 		public UnitMovementType GetMovementType()