diff --git a/assets/layers/bike_shop/bike_shop.json b/assets/layers/bike_shop/bike_shop.json
index 5ac2d7433..e07e17375 100644
--- a/assets/layers/bike_shop/bike_shop.json
+++ b/assets/layers/bike_shop/bike_shop.json
@@ -35,9 +35,18 @@
       "#": "We select all bicycle shops, sports shops (but we try to weed out non-bicycle related shops), and any shop with a bicycle related tag",
       "or": [
         "shop=bicycle",
-        "service:bicycle:retail=yes",
-        "service:bicycle:repair=yes",
-        "service:bicycle:second_hand=yes",
+        {
+          "and": [
+            "amenity!=bicycle_repair_station",
+            {
+              "or": [
+                "service:bicycle:retail=yes",
+                "service:bicycle:repair=yes",
+                "service:bicycle:second_hand=yes"
+              ]
+            }
+          ]
+        },
         {
           "#": "if sport is defined and is not bicycle, it is not matched; if bicycle retail/repair is marked as 'no', it is not shown to too.",
           "##": "There will be a few false-positives with this. They will get filtered out by people marking both 'not selling bikes' and 'not repairing bikes'. Furthermore, the OSMers will add a sports-subcategory on it",