diff --git a/assets/layers/parcel_lockers/parcel_lockers.json b/assets/layers/parcel_lockers/parcel_lockers.json
index c82c8cfc1..5b51a38fa 100644
--- a/assets/layers/parcel_lockers/parcel_lockers.json
+++ b/assets/layers/parcel_lockers/parcel_lockers.json
@@ -21,17 +21,7 @@
     "es": "Capa que muestra taquillas para recoger y enviar paquetes."
   },
   "source": {
-    "osmTags": {
-      "or": [
-        "amenity=parcel_locker",
-        {
-          "and": [
-            "amenity=vending_machine",
-            "vending=parcel_pickup;parcel_mail_in"
-          ]
-        }
-      ]
-    }
+    "osmTags": "amenity=parcel_locker"
   },
   "minzoom": 12,
   "title": {
@@ -259,9 +249,15 @@
             "cs": "Z této schránky na balíky <b>nemůžete posílat balíky</b>",
             "es": "No puedes enviar paquetes desde esta taquilla"
           }
+        },
+        {
+          "if": "parcel_mail_in=returns_only",
+          "then": {
+            "en": "You can send packages from this parcel locker, but only for returns",
+            "nl": "Je kan pakk etten versturen vanuit deze pakketautomaat, maar alleen voor retouren"
+          }
         }
-      ],
-      "condition": "amenity=parcel_locker"
+      ]
     },
     {
       "id": "pickup",
@@ -302,8 +298,7 @@
             "es": "No puedes recoger paquetes de esta taquilla"
           }
         }
-      ],
-      "condition": "amenity=parcel_locker"
+      ]
     }
   ],
   "filter": [
@@ -313,4 +308,4 @@
   "allowMove": {
     "enableImproveAccuracy": true
   }
-}
+}
\ No newline at end of file