diff --git a/.github/workflows/sonar-scan.yml b/.github/workflows/sonar-scan.yml
index 3a1dc7b38..dae384993 100644
--- a/.github/workflows/sonar-scan.yml
+++ b/.github/workflows/sonar-scan.yml
@@ -49,9 +49,11 @@ jobs:
       - name: 'Unzip Artifacts'
         run: |
           Expand-Archive -Force sonar-build.zip ${{ env.BUILD_WRAPPER_OUT_DIR }}
-          Expand-Archive -Force pr-number.zip .
-          $number = Get-Content -Path pr-number.txt
-          echo "PR_NUMBER=$number" >> $env:GITHUB_ENV
+          if (Test-Path -Path pr-number.zip) {
+            Expand-Archive -Force pr-number.zip .
+            $number = Get-Content -Path pr-number.txt
+            echo "PR_NUMBER=$number" >> $env:GITHUB_ENV
+          }
       - name: Set up JDK 11
         uses: actions/setup-java@v1
         with:
@@ -72,4 +74,5 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         run: |
-          sonar-scanner --define sonar.pullrequest.key="${{ env.PR_NUMBER }}" --define sonar.host.url="${{ env.SONAR_SERVER_URL }}" --define sonar.cfamily.build-wrapper-output="${{ env.BUILD_WRAPPER_OUT_DIR }}"
+          if ($null -ne $env:PR_NUMBER) { sonar-scanner --define sonar.pullrequest.key="${{ env.PR_NUMBER }}" --define sonar.host.url="${{ env.SONAR_SERVER_URL }}" --define sonar.cfamily.build-wrapper-output="${{ env.BUILD_WRAPPER_OUT_DIR }}" }
+          else { sonar-scanner --define sonar.host.url="${{ env.SONAR_SERVER_URL }}" --define sonar.cfamily.build-wrapper-output="${{ env.BUILD_WRAPPER_OUT_DIR }}" }