diff --git a/source/glest_game/world/world.cpp b/source/glest_game/world/world.cpp
index 8f60bad5..68076ee6 100644
--- a/source/glest_game/world/world.cpp
+++ b/source/glest_game/world/world.cpp
@@ -533,8 +533,12 @@ void World::moveUnitCells(Unit *unit){
 
 	//newPos must be free or the same pos as current
 	assert(map.getCell(unit->getPos())->getUnit(unit->getCurrField())==unit || map.isFreeCell(newPos, unit->getCurrField()));
-	map.clearUnitCells(unit, unit->getPos());
-	map.putUnitCells(unit, newPos);
+	// Only change cell plaement in map if the new position is different
+	// from the old one
+	if(newPos != unit->getPos()) {
+		map.clearUnitCells(unit, unit->getPos());
+		map.putUnitCells(unit, newPos);
+	}
 
 	//water splash
 	if(tileset.getWaterEffects() && unit->getCurrField()==fLand){