diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1998f0827..859a7116a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,8 +10,10 @@
 - build: upgrade pytest-approval and recreate approval files (4bdf27b5)
     - Upgrade of pytest-approval included breaking changes to the approval
     file naming scheme. All approval files are recreate (--auto-approve).
+- fix: topic cycleway did include ways with cycleway features with value “no” ([1018])
 
-[#1017] https://github.com/GIScience/ohsome-quality-api/pull/1017
+[#1017]: https://github.com/GIScience/ohsome-quality-api/pull/1017
+[#1018]: https://github.com/GIScience/ohsome-quality-api/pull/1018
 
 ## Release 1.17.1
 
diff --git a/ohsome_quality_api/topics/presets.yaml b/ohsome_quality_api/topics/presets.yaml
index f73de2103..279d624f7 100644
--- a/ohsome_quality_api/topics/presets.yaml
+++ b/ohsome_quality_api/topics/presets.yaml
@@ -171,14 +171,14 @@ cycleway:
   aggregation_type: length
   filter: >-
     ((cycleway=* and cycleway!=no) 
-    or (cycleway:both=*)
-    or (cycleway:right=*)
-    or (cycleway:left=*)
-    or (cycleway:right:lane=*)
-    or (cycleway:both:lane=*)
-    or (cycleway:left:lane=*)
-    or (cycleway:left:oneway=*)
-    or (cycleway:right:oneway=*)
+    or (cycleway:both=* and cycleway:both!=no)
+    or (cycleway:right=* and cycleway:right!=no)
+    or (cycleway:left=* and cycleway:left!=no)
+    or (cycleway:right:lane=* and cycleway:right:lane!=no)
+    or (cycleway:both:lane=* and cycleway:both:lane!=no)
+    or (cycleway:left:lane=* and cycleway:left:lane!=no)
+    or (cycleway:left:oneway=* and cycleway:left:oneway!=no)
+    or (cycleway:right:oneway=* and cycleway:right:oneway!=no)
     or (highway=cycleway)
     or (highway=path and bicycle=designated)
     or (bicycle_road=yes)