diff --git a/app/src/main/java/eu/faircode/email/ApplicationEx.java b/app/src/main/java/eu/faircode/email/ApplicationEx.java
index 2875885f95..5a2cdb4a23 100644
--- a/app/src/main/java/eu/faircode/email/ApplicationEx.java
+++ b/app/src/main/java/eu/faircode/email/ApplicationEx.java
@@ -139,7 +139,7 @@ public class ApplicationEx extends Application
 
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
         final boolean crash_reports = prefs.getBoolean("crash_reports", false);
-        final boolean leak_canary = prefs.getBoolean("leak_canary", false);
+        final boolean leak_canary = prefs.getBoolean("leak_canary", BuildConfig.TEST_RELEASE);
         final boolean load_emoji = prefs.getBoolean("load_emoji", true);
 
         prev = Thread.getDefaultUncaughtExceptionHandler();
diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
index ba79e67bec..44ac1893b1 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
@@ -2380,7 +2380,7 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
             swProtocol.setChecked(prefs.getBoolean("protocol", false));
             swLogInfo.setChecked(prefs.getInt("log_level", android.util.Log.WARN) <= android.util.Log.INFO);
             swDebug.setChecked(prefs.getBoolean("debug", false));
-            swCanary.setChecked(prefs.getBoolean("leak_canary", false));
+            swCanary.setChecked(prefs.getBoolean("leak_canary", BuildConfig.TEST_RELEASE));
             swTest1.setChecked(prefs.getBoolean("test1", false));
             swTest2.setChecked(prefs.getBoolean("test2", false));
             swTest3.setChecked(prefs.getBoolean("test3", false));