diff --git a/src/water_cmd.cpp b/src/water_cmd.cpp
index 76b4ee4d2f..7b388ae3fd 100644
--- a/src/water_cmd.cpp
+++ b/src/water_cmd.cpp
@@ -66,6 +66,9 @@ void MakeWaterOrCanalDependingOnSurroundings(TileIndex t, Owner o)
 {
 	assert(GetTileSlope(t, NULL) == SLOPE_FLAT);
 
+	/* Mark tile dirty in all cases */
+	MarkTileDirtyByTile(t);
+
 	/* Non-sealevel -> canal */
 	if (TileHeight(t) != 0) {
 		MakeCanal(t, o);
@@ -87,7 +90,6 @@ void MakeWaterOrCanalDependingOnSurroundings(TileIndex t, Owner o)
 	} else {
 		MakeWater(t);
 	}
-	MarkTileDirtyByTile(t);
 }