diff --git a/project.mml b/project.mml
index 9570321756..1b1dfa6fa0 100644
--- a/project.mml
+++ b/project.mml
@@ -233,7 +233,7 @@ Layer:
         ) AS water_areas
     properties:
       cache-features: true
-      minzoom: 0
+      minzoom: 5
   - id: ocean-lz
     geometry: polygon
     <<: *extents
@@ -1971,8 +1971,7 @@ Layer:
             COALESCE(
               'landuse_' || CASE WHEN landuse IN ('forest', 'military', 'farmland') THEN landuse END,
               'military_' || CASE WHEN military IN ('danger_area') THEN military END,
-              'natural_' || CASE WHEN "natural" IN ('wood', 'glacier', 'sand', 'scree', 'shingle', 'bare_rock',
-                                                    'water', 'bay', 'strait') THEN "natural" END,
+              'natural_' || CASE WHEN "natural" IN ('wood', 'glacier', 'sand', 'scree', 'shingle', 'bare_rock', 'water') THEN "natural" END,
               'place_' || CASE WHEN place IN ('island') THEN place END,
               'boundary_' || CASE WHEN boundary IN ('aboriginal_lands', 'national_park')
                                        OR (boundary = 'protected_area' AND tags->'protect_class' IN ('1','1a','1b','2','3','4','5','6'))
@@ -1986,7 +1985,7 @@ Layer:
             AND name IS NOT NULL
             AND (landuse IN ('forest', 'military', 'farmland')
               OR military IN ('danger_area')
-              OR "natural" IN ('wood', 'glacier', 'sand', 'scree', 'shingle', 'bare_rock', 'water', 'bay', 'strait')
+              OR "natural" IN ('wood', 'glacier', 'sand', 'scree', 'shingle', 'bare_rock', 'water')
               OR "place" IN ('island')
               OR boundary IN ('aboriginal_lands', 'national_park')
               OR (boundary = 'protected_area' AND tags->'protect_class' IN ('1','1a','1b','2','3','4','5','6'))
@@ -1997,7 +1996,7 @@ Layer:
           ORDER BY way_area DESC
         ) AS text_poly_low_zoom
     properties:
-      minzoom: 0
+      minzoom: 4
       maxzoom: 9
   - id: text-line
     geometry: linestring
diff --git a/style/water.mss b/style/water.mss
index 2fe07b7c39..314f990104 100644
--- a/style/water.mss
+++ b/style/water.mss
@@ -287,12 +287,12 @@
 #text-poly-low-zoom[zoom < 10],
 #text-point[zoom >= 10] {
   [feature = 'natural_water'],
-  [feature = 'natural_bay'],
-  [feature = 'natural_strait'],
   [feature = 'landuse_reservoir'],
   [feature = 'landuse_basin'],
-  [feature = 'waterway_dock'] {
-    [zoom >= 0][way_pixels > 3000][way_pixels <= 768000],
+  [feature = 'waterway_dock'],
+  [feature = 'natural_strait'],
+  [feature = 'natural_bay'] {
+    [zoom >= 5][way_pixels > 3000][way_pixels <= 768000],
     [zoom >= 14][way_pixels <= 768000][feature = 'natural_bay'],
     [zoom >= 14][way_pixels <= 768000][feature = 'natural_strait'],
     [zoom >= 17][way_pixels <= 768000] {
@@ -301,6 +301,7 @@
       text-wrap-width: 25; // 2.5 em
       text-line-spacing: -1.5; // -0.15 em
       [way_pixels > 12000],
+      [zoom >= 15][feature = 'natural_strait'],
       [zoom >= 15][feature = 'natural_strait'] {
         text-size: 12;
         text-wrap-width: 37; // 3.1 em