diff --git a/style/water.mss b/style/water.mss
index 314f990104..5de2d72221 100644
--- a/style/water.mss
+++ b/style/water.mss
@@ -300,19 +300,19 @@
       text-size: 10;
       text-wrap-width: 25; // 2.5 em
       text-line-spacing: -1.5; // -0.15 em
-      [way_pixels > 12000],
+      [way_pixels > 12000][feature != 'natural_strait'][feature != 'natural_bay'],
       [zoom >= 15][feature = 'natural_strait'],
-      [zoom >= 15][feature = 'natural_strait'] {
+      [zoom >= 15][feature = 'natural_bay'] {
         text-size: 12;
         text-wrap-width: 37; // 3.1 em
         text-line-spacing: -1.6; // -0.13 em
       }
-      [way_pixels > 48000] {
+      [way_pixels > 48000][feature != 'natural_strait'][feature != 'natural_bay'] {
         text-size: 15;
         text-wrap-width: 59; // 3.9 em
         text-line-spacing: -1.5; // -0.10 em
       }
-      [way_pixels > 192000] {
+      [way_pixels > 192000][feature != 'natural_strait'][feature != 'natural_bay'] {
         text-size: 19;
         text-wrap-width: 95; // 5.0 em
         text-line-spacing: -0.95; // -0.05 em