diff --git a/app/src/main/java/eu/faircode/email/DebugHelper.java b/app/src/main/java/eu/faircode/email/DebugHelper.java
index bf6680dfd3..a0342792bd 100644
--- a/app/src/main/java/eu/faircode/email/DebugHelper.java
+++ b/app/src/main/java/eu/faircode/email/DebugHelper.java
@@ -275,10 +275,9 @@ public class DebugHelper {
         sb.append(String.format("MIUI: %s\r\n", miui == null ? "-" : miui));
 
         boolean reporting = prefs.getBoolean("crash_reports", false);
-        if (reporting || Log.isTestRelease()) {
-            String uuid = prefs.getString("uuid", null);
-            sb.append(String.format("Bugsnag UUID: %s\r\n", uuid == null ? "-" : uuid));
-        }
+        String uuid = (reporting || Log.isTestRelease()
+                ? prefs.getString("uuid", null) : null);
+        sb.append(String.format("Bugsnag UUID: %s\r\n", uuid == null ? "-" : uuid));
 
         try {
             ApplicationInfo app = pm.getApplicationInfo(context.getPackageName(), PackageManager.GET_META_DATA);