diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 7071cef359..d7738b1e50 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -46,8 +46,7 @@ jobs:
     - name: Check with Lint
       run: ./gradlew lintGithubRelease
     - name: Build with Gradle
-      #https://docs.bugsnag.com/build-integrations/gradle/#manual-upload
-      run: ./gradlew assembleGithubRelease assembleLargeRelease assemblePlayRelease uploadBugsnagGithub-releaseMapping uploadBugsnagLarge-releaseMapping uploadBugsnagPlay-releaseMapping uploadBugsnagNdkGithub-releaseMapping uploadBugsnagNdkLarge-releaseMapping uploadBugsnagNdkPlay-releaseMapping
+      run: ./gradlew assembleGithubRelease assembleLargeRelease assemblePlayRelease uploadBugsnagGithub-releaseMapping uploadBugsnagLarge-releaseMapping uploadBugsnagPlay-releaseMapping
     - name: Upload to BitBucket
       run: |
         ./gradlew upload -Ptarget=play-preview
diff --git a/app/build.gradle b/app/build.gradle
index f4775a31a2..d6af0883de 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -357,7 +357,7 @@ android {
     bugsnag {
         // https://docs.bugsnag.com/build-integrations/gradle/
         uploadJvmMappings = false // disables upload of ProGuard/DexGuard/R8 mapping files
-        uploadNdkMappings = true // disables upload of NDK mapping files
+        uploadNdkMappings = false // disables upload of NDK mapping files
         reportBuilds = false // disables upload of build metadata
         overwrite = true
         builderName = "M66B"
@@ -737,7 +737,7 @@ dependencies {
     // https://mvnrepository.com/artifact/com.bugsnag/bugsnag-android
     implementation("com.bugsnag:bugsnag-android:$bugsnag_version") {
         exclude group: "com.bugsnag", module: "bugsnag-plugin-android-anr"
-        //exclude group: "com.bugsnag", module: "bugsnag-plugin-android-ndk"
+        exclude group: "com.bugsnag", module: "bugsnag-plugin-android-ndk"
         exclude group: "com.bugsnag", module: "bugsnag-android-core"
     }
 
diff --git a/app/src/main/java/eu/faircode/email/Log.java b/app/src/main/java/eu/faircode/email/Log.java
index 10879e9545..5e2b14841f 100644
--- a/app/src/main/java/eu/faircode/email/Log.java
+++ b/app/src/main/java/eu/faircode/email/Log.java
@@ -407,9 +407,9 @@ public class Log {
             config.setAutoTrackSessions(false);
 
             ErrorTypes etypes = new ErrorTypes();
-            etypes.setAnrs(BuildConfig.DEBUG);
-            etypes.setNdkCrashes(true);
             etypes.setUnhandledExceptions(true);
+            etypes.setAnrs(BuildConfig.DEBUG);
+            etypes.setNdkCrashes(false);
             config.setEnabledErrorTypes(etypes);
             config.setMaxBreadcrumbs(BuildConfig.PLAY_STORE_RELEASE ? 250 : 500);