diff --git a/assets/layers/vending_machine/vending_machine.json b/assets/layers/vending_machine/vending_machine.json
index 3ebadd370..3ac7b4395 100644
--- a/assets/layers/vending_machine/vending_machine.json
+++ b/assets/layers/vending_machine/vending_machine.json
@@ -26,6 +26,7 @@
       ]
     }
   },
+  "minzoom": 13,
   "calculatedTags": [
     "_vending_count=feat.properties.vending.split(';').length"
   ],
diff --git a/assets/themes/vending_machine/vending_machine.json b/assets/themes/vending_machine/vending_machine.json
index a488196fa..7e77a9590 100644
--- a/assets/themes/vending_machine/vending_machine.json
+++ b/assets/themes/vending_machine/vending_machine.json
@@ -62,7 +62,10 @@
       "override": {
         "isCounted": false,
         "name": null,
-        "minzoom": 18
+        "minzoom": 16,
+        "=filter": {
+          "sameAs": "vending_machine"
+        }
       }
     },
     {
@@ -70,7 +73,10 @@
       "override": {
         "isCounted": false,
         "name": null,
-        "minzoom": 18
+        "minzoom": 13,
+        "=filter": {
+          "sameAs": "vending_machine"
+        }
       }
     },
     {
@@ -78,8 +84,11 @@
       "override": {
         "isCounted": false,
         "name": null,
-        "minzoom": 18
+        "minzoom": 16,
+        "=filter": {
+          "sameAs": "vending_machine"
+        }
       }
     }
   ]
-}
+}
\ No newline at end of file