diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index c1454a51e..aed0b61d8 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -236,8 +236,8 @@ jobs:
           workflow: gh_pages.yaml  # takes no inputs
   
   conda_trigger:
-    if: ${{ inputs.conda }}
     needs: [build, test, publish]
+    if: ${{ inputs.conda && !cancelled() && !contains(needs.*.result, 'failure') }}
     runs-on: ${{ inputs.runner }}
     
     steps:
@@ -255,7 +255,7 @@ jobs:
   
   cleanup:
     needs: [build, test, publish, conda_trigger]
-    if: always()
+    if: ${{ !cancelled() }}
     runs-on: ${{ inputs.runner }}
     
     steps: