diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
index 592bdfe73..4012ade08 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
@@ -1006,7 +1006,7 @@ class ChatController(args: Bundle) : BaseController(args), MessagesListAdapter
 
                 }
 
-                if (isFirstMessagesProcessing) {
+                if (wasFirstMessageProcessing && chatMessageList.size > 0) {
                     globalLastKnownFutureMessageId = chatMessageList[0].jsonMessageId
                 }