diff --git a/app/src/main/java/eu/faircode/email/Log.java b/app/src/main/java/eu/faircode/email/Log.java
index 51c7964113..e5a26ad800 100644
--- a/app/src/main/java/eu/faircode/email/Log.java
+++ b/app/src/main/java/eu/faircode/email/Log.java
@@ -202,16 +202,11 @@ public class Log {
         config.beforeSend(new BeforeSend() {
             @Override
             public boolean run(@NonNull Report report) {
-                boolean crash_reports = prefs.getBoolean("crash_reports", false); // opt-in
+                // opt-in
+                boolean crash_reports = prefs.getBoolean("crash_reports", false);
                 if (!crash_reports)
                     return false;
 
-                int count = prefs.getInt("crash_report_count", 0);
-                count++;
-                prefs.edit().putInt("crash_report_count", count).apply();
-                if (count > MAX_CRASH_REPORTS)
-                    return false;
-
                 Throwable ex = report.getError().getException();
 
                 if (ex instanceof MessagingException &&
@@ -241,6 +236,13 @@ public class Log {
                                 ex.getMessage().startsWith("https://autoconfig.thunderbird.net/")))
                     return false;
 
+                // Rate limit
+                int count = prefs.getInt("crash_report_count", 0);
+                count++;
+                prefs.edit().putInt("crash_report_count", count).apply();
+                if (count > MAX_CRASH_REPORTS)
+                    return false;
+
                 return true;
             }
         });