diff --git a/src/water_cmd.cpp b/src/water_cmd.cpp
index e235e5395f..56a2249686 100644
--- a/src/water_cmd.cpp
+++ b/src/water_cmd.cpp
@@ -1327,7 +1327,7 @@ void TileLoop_Water(TileIndex tile)
 	if (IsTileType(tile, MP_WATER)) AmbientSoundEffect(tile);
 
 	/* At day lengths > 4, handle flooding in auxiliary tile loop */
-	if (_settings_game.economy.day_length_factor > 4) return;
+	if (_settings_game.economy.day_length_factor > 4 && _game_mode != GM_EDITOR) return;
 
 	if (IsNonFloodingWaterTile(tile)) return;