diff --git a/app/src/main/java/eu/faircode/email/ViewModelMessages.java b/app/src/main/java/eu/faircode/email/ViewModelMessages.java
index 1afe6739ea..1aea88e483 100644
--- a/app/src/main/java/eu/faircode/email/ViewModelMessages.java
+++ b/app/src/main/java/eu/faircode/email/ViewModelMessages.java
@@ -567,7 +567,7 @@ public class ViewModelMessages extends ViewModel {
             if (boundary != null) {
                 BoundaryCallbackMessages.State state = boundary.setCallback(callback);
                 PagedList<TupleMessageEx> plist = list.getValue();
-                if (plist != null)
+                if (plist != null && plist.size() > 0)
                     plist.loadAround(0);
 
                 owner.getLifecycle().addObserver(new LifecycleObserver() {