diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
index fa7d2a8cc52d..68b4454d1aa8 100644
--- a/.github/workflows/backport.yml
+++ b/.github/workflows/backport.yml
@@ -25,7 +25,11 @@ jobs:
   backport:
     needs: [label_checker]
     name: Backport PR
-    if: github.event.pull_request.merged == true && needs.label_checker.outputs.state == 'success'
+    if: >-
+      github.event.pull_request.merged == true
+      && needs.label_checker.outputs.state == 'success'
+      && !startsWith(github.event.pull_request.head.ref, 'merge-train/')
+      && !startsWith(github.event.pull_request.head.ref, 'backport-to-')
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
diff --git a/scripts/backport_to_staging.sh b/scripts/backport_to_staging.sh
index b0f4459a8d77..e43839569277 100755
--- a/scripts/backport_to_staging.sh
+++ b/scripts/backport_to_staging.sh
@@ -204,8 +204,9 @@ else
   echo "PR already exists (#$EXISTING_PR)"
 fi
 
-# Update PR body with commit override markers (same mechanism as merge-trains)
+# Update PR body with commit override markers (same mechanism as merge-trains).
+# Non-fatal: the backport itself already succeeded at this point.
 echo "Updating PR body with commit list..."
-do_or_dryrun "$root/scripts/merge-train/update-pr-body.sh" "$STAGING_BRANCH"
+do_or_dryrun "$root/scripts/merge-train/update-pr-body.sh" "$STAGING_BRANCH" || echo "Warning: Failed to update PR body (non-fatal)"
 
 do_or_dryrun echo "Successfully backported PR #$PR_NUMBER to $STAGING_BRANCH"