diff --git a/FlowCrypt/Controllers/Inbox/InboxViewController.swift b/FlowCrypt/Controllers/Inbox/InboxViewController.swift
index 84b84cd88..44e5505e7 100644
--- a/FlowCrypt/Controllers/Inbox/InboxViewController.swift
+++ b/FlowCrypt/Controllers/Inbox/InboxViewController.swift
@@ -228,11 +228,18 @@ extension InboxViewController {
         case .idle:
             fetchAndRenderEmails(context)
         case let .fetched(.byNumber(total)):
-            if inboxInput.count != total {
-                loadMore(context)
+            guard inboxInput.count != total else {
+                context?.completeBatchFetching(true)
+                return
             }
+
+            loadMore(context)
         case let .fetched(.byNextPage(token)):
-            guard token != nil else { return }
+            guard token != nil else {
+                context?.completeBatchFetching(true)
+                return
+            }
+
             loadMore(context)
         case .empty:
             fetchAndRenderEmails(context)