diff --git a/features/bicycle/barrier.feature b/features/bicycle/barrier.feature
index a23eee54c9b..ae4ab579ce8 100644
--- a/features/bicycle/barrier.feature
+++ b/features/bicycle/barrier.feature
@@ -19,7 +19,7 @@ Feature: Barriers
             | entrance       | x     |
             | wall           |       |
             | fence          |       |
-            | some_tag       |       |
+            | some_tag       | x     |
             | block          | x     |
 
     Scenario: Bike - Access tag trumphs barriers
diff --git a/profiles/bicycle.lua b/profiles/bicycle.lua
index f08bcebe26d..0cd3a62c9be 100644
--- a/profiles/bicycle.lua
+++ b/profiles/bicycle.lua
@@ -38,20 +38,10 @@ function setup()
       mode.pushing_bike
     },
 
-    barrier_whitelist = Set {
-      'sump_buster',
-      'bus_trap',
-      'cycle_barrier',
-      'bollard',
-      'entrance',
-      'cattle_grid',
-      'border_control',
-      'toll_booth',
-      'sally_port',
-      'gate',
-      'lift_gate',
-      'no',
-      'block'
+    barrier_blacklist = Set {
+      'yes',
+      'wall',
+      'fence'
     },
 
     access_tag_whitelist = Set {
@@ -245,7 +235,7 @@ function process_node(profile, node, result)
   else
     local barrier = node:get_value_by_key("barrier")
     if barrier and "" ~= barrier then
-      if not profile.barrier_whitelist[barrier] then
+      if profile.barrier_blacklist[barrier] then
         result.barrier = true
       end
     end