1 files changed, 12 insertions, 6 deletions
diff --git a/src/main/java/de/pixart/messenger/services/MessageArchiveService.java b/src/main/java/de/pixart/messenger/services/MessageArchiveService.java
index f0d48a86f..a05cf5ad5 100644
--- a/src/main/java/de/pixart/messenger/services/MessageArchiveService.java
+++ b/src/main/java/de/pixart/messenger/services/MessageArchiveService.java
@@ -270,12 +270,18 @@ public class MessageArchiveService implements OnAdvancedStreamFeaturesLoaded {
             query.getConversation().setFirstMamReference(first == null ? null : first.getContent());
         }
         if (complete || relevant == null || abort) {
-            boolean done = !query.isCatchup();
-            if (count != null && !query.isCatchup()) {
-                try {
-                    done = Integer.parseInt(count) <= query.getTotalCount();
-                } catch (NumberFormatException e) {
-                    done = false;
+            boolean done;
+            if (query.isCatchup()) {
+                done = false;
+            } else {
+                if (count != null) {
+                    try {
+                        done = Integer.parseInt(count) <= query.getTotalCount();
+                    } catch (NumberFormatException e) {
+                        done = false;
+                    }
+                } else {
+                    done = query.getTotalCount() == 0;
                 }
             }
             done = done || (query.getActualMessageCount() == 0 && !query.isCatchup());