diff --git a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
index 1b7c03ca55..fceaf8f409 100644
--- a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
+++ b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
@@ -129,7 +129,8 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
         this.criteria = criteria;
         this.pageSize = pageSize;
 
-        if (this.folder != null || server || EntityFolder.INBOX.equals(this.criteria.with_folder_type))
+        if (this.criteria != null &&
+                (this.folder != null || server || EntityFolder.INBOX.equals(this.criteria.with_folder_type)))
             this.criteria.with_folder_type = null;
     }