diff --git a/.github/workflows/openhands-resolver.yml b/.github/workflows/openhands-resolver.yml
index 6b04b2dc02a7..44875b177ec5 100644
--- a/.github/workflows/openhands-resolver.yml
+++ b/.github/workflows/openhands-resolver.yml
@@ -181,6 +181,7 @@ jobs:
           retention-days: 30 # Keep the artifact for 30 days
 
       - name: Create draft PR or push branch
+        if: always() # Create PR or branch even if the previous steps fail
         env:
           GITHUB_TOKEN: ${{ secrets.PAT_TOKEN }}
           GITHUB_USERNAME: ${{ secrets.PAT_USERNAME }}
@@ -204,6 +205,7 @@ jobs:
 
       - name: Comment on issue
         uses: actions/github-script@v7
+        if: always() # Comment on issue even if the previous steps fail
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}
           script: |