diff --git a/cycle_amenities.json b/cycle_amenities.json
index 925ade8a..ed8d219f 100644
--- a/cycle_amenities.json
+++ b/cycle_amenities.json
@@ -13,7 +13,7 @@
             "node[amenity~\"^(bicycle_rental)$\"];",
             "way[amenity~\"^(bicycle_rental)$\"];",
             "relation[amenity~\"^(bicycle_rental)$\"];",
-            "node[amenity~\"^(charging_station)$\"][bicycle!=\"no\"];",
+            "node[amenity~\"^(charging_station)$\"][bicycle][bicycle!=\"no\"];",
             "node[shop~\"^(bicycle)$\"];",
             "way[shop~\"^(bicycle)$\"];",
             "relation[shop~\"^(bicycle)$\"];",
@@ -24,7 +24,7 @@
             "node[amenity~\"^(bicycle_.*|compressed_air)$\"];",
             "way[amenity~\"^(bicycle_.*|compressed_air)$\"];",
             "relation[amenity~\"^(bicycle_.*|compressed_air)$\"];",
-            "node[amenity~\"^(charging_station)$\"][bicycle!=\"no\"];",
+            "node[amenity~\"^(charging_station)$\"][bicycle][bicycle!=\"no\"];",
             "node[shop~\"^(bicycle)$\"];",
             "way[shop~\"^(bicycle)$\"];",
             "relation[shop~\"^(bicycle)$\"];",