diff --git a/app/src/main/java/eu/faircode/email/DaoLog.java b/app/src/main/java/eu/faircode/email/DaoLog.java
index 5a34ac55c9..9058949867 100644
--- a/app/src/main/java/eu/faircode/email/DaoLog.java
+++ b/app/src/main/java/eu/faircode/email/DaoLog.java
@@ -32,8 +32,8 @@ public interface DaoLog {
             " WHERE time > :from" +
             " AND (:type IS NULL OR type = :type)" +
             " ORDER BY time DESC" +
-            " LIMIT 2000")
-    LiveData<List<EntityLog>> liveLogs(long from, Integer type);
+            " LIMIT :limit")
+    LiveData<List<EntityLog>> liveLogs(long from, int limit, Integer type);
 
     @Query("SELECT * FROM log" +
             " WHERE time > :from" +
diff --git a/app/src/main/java/eu/faircode/email/FragmentLogs.java b/app/src/main/java/eu/faircode/email/FragmentLogs.java
index 4496c3ce27..9deafd3569 100644
--- a/app/src/main/java/eu/faircode/email/FragmentLogs.java
+++ b/app/src/main/java/eu/faircode/email/FragmentLogs.java
@@ -128,9 +128,10 @@ public class FragmentLogs extends FragmentBase {
         super.onActivityCreated(savedInstanceState);
 
         long from = new Date().getTime() - 24 * 3600 * 1000L;
+        int limit = (BuildConfig.DEBUG ? 10000 : 2000);
 
         DB db = DB.getInstance(getContext());
-        db.log().liveLogs(from, null).observe(getViewLifecycleOwner(), new Observer<List<EntityLog>>() {
+        db.log().liveLogs(from, limit, null).observe(getViewLifecycleOwner(), new Observer<List<EntityLog>>() {
             @Override
             public void onChanged(List<EntityLog> logs) {
                 if (logs == null)