diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index fd615a1cb4..ac4dc159cf 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -52,6 +52,8 @@ jobs:
             qt_arch: 'android_x86'
             all_files_access: 'ON'
             artifact_name: 'android-x86'
+    env:
+      SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
 
     steps:
       - name: 🐣 Checkout
@@ -209,9 +211,8 @@ jobs:
 
       - name: 📮 Upload debug symbols
         # if: release or labeled PR
-        if: ${{ matrix.all_files_access == 'OFF' }}
+        if: ${{ matrix.all_files_access == 'OFF' && env.SENTRY_AUTH_TOKEN != '' }}
         env:
-          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
           SENTRY_ORG_SLUG: opengisch
           SENTRY_PROJECT_SLUG: qfield
         run: |
diff --git a/platform/android/CPackAndroidDeployQt.cmake.in b/platform/android/CPackAndroidDeployQt.cmake.in
index 437f40c497..aab790ea06 100644
--- a/platform/android/CPackAndroidDeployQt.cmake.in
+++ b/platform/android/CPackAndroidDeployQt.cmake.in
@@ -1,6 +1,6 @@
-if(DEFINED ENV{KEYNAME}
-   AND DEFINED ENV{KEYPASS}
-   AND DEFINED ENV{STOREPASS})
+if(NOT "$ENV{KEYNAME}" STREQUAL ""
+   AND NOT "$ENV{KEYPASS}" STREQUAL ""
+   AND NOT "$ENV{STOREPASS}" STREQUAL "")
   execute_process(
     COMMAND
       "@ANDROIDDEPLOYQT_EXECUTABLE@"