diff --git a/app/build.gradle b/app/build.gradle
index 659188bac2..35739cd6b5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -23,6 +23,7 @@ android {
             minifyEnabled = true
             useProguard = true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            buildConfigField "boolean", "BETA_RELEASE", "true"
             buildConfigField "boolean", "PLAY_STORE_RELEASE", "false"
             buildConfigField "String", "GITHUB_LATEST_API", "\"https://api.github.com/repos/M66B/open-source-email/releases/latest\""
         }
@@ -31,6 +32,7 @@ android {
             minifyEnabled = true
             useProguard = true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            buildConfigField "boolean", "BETA_RELEASE", "true"
             buildConfigField "boolean", "PLAY_STORE_RELEASE", "true"
             buildConfigField "String", "GITHUB_LATEST_API", "\"\""
         }
@@ -39,6 +41,7 @@ android {
             minifyEnabled = false
             useProguard = false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            buildConfigField "boolean", "BETA_RELEASE", "true"
             buildConfigField "boolean", "PLAY_STORE_RELEASE", "false"
             buildConfigField "String", "GITHUB_LATEST_API", "\"https://api.github.com/repos/M66B/open-source-email/releases/latest\""
         }
diff --git a/app/src/main/java/eu/faircode/email/ApplicationEx.java b/app/src/main/java/eu/faircode/email/ApplicationEx.java
index 902cc3398d..088c7f452c 100644
--- a/app/src/main/java/eu/faircode/email/ApplicationEx.java
+++ b/app/src/main/java/eu/faircode/email/ApplicationEx.java
@@ -48,7 +48,8 @@ public class ApplicationEx extends Application {
                 if (ownFault(ex)) {
                     Log.e(ex);
 
-                    if (!Helper.isPlayStoreInstall(ApplicationEx.this))
+                    if (BuildConfig.BETA_RELEASE ||
+                            !Helper.isPlayStoreInstall(ApplicationEx.this))
                         writeCrashLog(ApplicationEx.this, ex);
 
                     if (prev != null)
diff --git a/app/src/main/java/eu/faircode/email/Log.java b/app/src/main/java/eu/faircode/email/Log.java
index 13463f0fb7..63e14c32ae 100644
--- a/app/src/main/java/eu/faircode/email/Log.java
+++ b/app/src/main/java/eu/faircode/email/Log.java
@@ -4,7 +4,10 @@ public class Log {
     static final String TAG = "fairemail";
 
     public static int i(String msg) {
-        return android.util.Log.i(TAG, msg);
+        if (BuildConfig.BETA_RELEASE)
+            return android.util.Log.i(TAG, msg);
+        else
+            return 0;
     }
 
     public static int w(String msg) {