diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index c16996b..d327271 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -417,6 +417,7 @@ jobs:
         id: rollback-prepare
 
       - name: Discard blocking VCS run before GitHub rollback
+        id: rollback-discard-vcs
         if: failure() && steps.rollback-prepare.outputs.rollback_label != ''
         run: |
           set -euo pipefail
@@ -505,7 +506,7 @@ jobs:
 
       - name: Create Terraform rollback run
         id: rollback-run
-        if: failure() && steps.rollback-prepare.outputs.rollback_label != ''
+        if: failure() && steps.rollback-prepare.outputs.rollback_label != '' && steps.rollback-discard-vcs.outcome == 'success'
         uses: hashicorp/tfc-workflows-github/actions/create-run@8e08d1ba957673f5fbf971a22b3219639dc45661 # v1.3.2
         env:
           TF_VAR_release_version_label: '"${{ steps.rollback-prepare.outputs.rollback_label }}"'