diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml
index ab873429b..fc11375fa 100644
--- a/.github/workflows/ci-cd.yml
+++ b/.github/workflows/ci-cd.yml
@@ -1540,7 +1540,7 @@ jobs:
     - check
     - pre-setup  # transitive, for accessing settings
     if: >-
-      always()
+      !cancelled()
       && ! (
         contains(needs.*.result, 'skipped')
         || contains(needs.*.result, 'failure')
@@ -1575,7 +1575,7 @@ jobs:
     - check
     - pre-setup  # transitive, for accessing settings
     if: >-
-      always()
+      !cancelled()
       && ! (
         contains(needs.*.result, 'skipped')
         || contains(needs.*.result, 'failure')
@@ -1806,7 +1806,7 @@ jobs:
     - check
     - pre-setup  # transitive, for accessing settings
     if: >-
-      always()
+      !cancelled()
       && ! (
         contains(needs.*.result, 'skipped')
         || contains(needs.*.result, 'failure')