diff --git a/project.mml b/project.mml
index 1d257b2380..64ecbfd6a6 100644
--- a/project.mml
+++ b/project.mml
@@ -666,7 +666,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over",
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508",
-        "table": "(SELECT\n    way, barrier\n  FROM planet_osm_line\n  WHERE barrier IS NOT NULL\n) AS line_barriers",
+        "table": "(SELECT\n    way, barrier\n  FROM planet_osm_line\n  WHERE barrier IN ('chain', 'city_wall', 'embankment', 'ditch', 'fence', 'guard_rail',\n          'handrail', 'hedge', 'kerb', 'retaining_wall', 'wall')\n  AND waterway NOT IN ('river', 'canal', 'derelict_canal', 'stream', 'drain', 'ditch', 'wadi')\n) AS line_barriers",
         "geometry_field": "way",
         "type": "postgis",
         "key_field": "",
@@ -679,7 +679,7 @@
         85.05112877980659
       ],
       "properties": {
-        "minzoom": 16
+        "minzoom": 14
       },
       "advanced": {}
     },
diff --git a/project.yaml b/project.yaml
index 93f63972a3..f7b704107a 100644
--- a/project.yaml
+++ b/project.yaml
@@ -665,10 +665,12 @@ Layer:
         (SELECT
             way, barrier
           FROM planet_osm_line
-          WHERE barrier IS NOT NULL
+          WHERE barrier IN ('chain', 'city_wall', 'embankment', 'ditch', 'fence', 'guard_rail',
+                  'handrail', 'hedge', 'kerb', 'retaining_wall', 'wall')
+          AND waterway NOT IN ('river', 'canal', 'derelict_canal', 'stream', 'drain', 'ditch', 'wadi')
         ) AS line_barriers
     properties:
-      minzoom: 16
+      minzoom: 14
     advanced: {}
   - id: "cliffs"
     name: "cliffs"