diff --git a/layers/waterway/waterway.sql b/layers/waterway/waterway.sql
index 22ce2a7f..c1a9e370 100644
--- a/layers/waterway/waterway.sql
+++ b/layers/waterway/waterway.sql
@@ -318,8 +318,8 @@ $$
 SELECT geometry,
        class,
        NULLIF(name, '') AS name,
-       COALESCE(NULLIF(name_en, ''), name) AS name_en,
-       COALESCE(NULLIF(name_de, ''), name, name_en) AS name_de,
+       COALESCE(NULLIF(name_en, ''), NULLIF(name, '')) AS name_en,
+       COALESCE(NULLIF(name_de, ''), NULLIF(name, ''), NULLIF(name_en, '')) AS name_de,
        waterway_brunnel(is_bridge, is_tunnel) AS brunnel,
        is_intermittent::int AS intermittent,
        tags