diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 71cfd8bca0..1607e8efca 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -42,12 +42,14 @@ jobs:
             app/build/outputs/apk/debug/*.apk
       - uses: rnkdsh/action-upload-diawi@v1.3.2
         id: diawi
-        if: ${{ github.event_name == 'pull_request' }}
-        with:
+        env:
           token: ${{ secrets.DIAWI_TOKEN }}
+        if: ${{ github.event_name == 'pull_request' && env.token != '' }}
+        with:
+          token: ${{ env.token }}
           file: app/build/outputs/apk/debug/app-arm64-v8a-debug.apk
       - name: Add or update PR comment with QR Code to download APK.
-        if: ${{ github.event_name == 'pull_request' }}
+        if: ${{ github.event_name == 'pull_request' && steps.diawi.conclusion == 'success' }}
         uses: NejcZdovc/comment-pr@v2
         with:
           message: |