diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e366859284..9ee476dce2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -765,10 +765,13 @@ jobs:
     if: always()
     runs-on: ubuntu-latest
     steps:
-      - name: Check for failures
-        if: contains(needs.*.result, 'failure')
+      - name: Output needs
+        run: echo "${{ toJson(needs) }}"
+
+      - name: Check if any required jobs failed or been cancelled
+        if: contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled')
         run: |
-          echo "One of the dependent jobs have failed. You may need to re-run it." && exit 1
+          echo "One of the dependent jobs have failed or been cancelled. You may need to re-run it." && exit 1
 
   canary:
     needs: [
@@ -777,7 +780,7 @@ jobs:
     ]
     name: Canary
     runs-on: ubuntu-latest
-    if: always() && needs.job_get_metadata.outputs.is_canary_branch == 'true' && !(contains(needs.*.result, 'failure') || contains(needs.*.result, 'skipped'))
+    if: always() && needs.job_get_metadata.outputs.is_canary_branch == 'true' && !(contains(needs.*.result, 'cancelled') || contains(needs.*.result, 'failure') || contains(needs.*.result, 'skipped'))
     steps:
       - name: Set env variables
         run: |