diff --git a/Anytype/Sources/PresentationLayer/Modules/Chat/ChatViewModel.swift b/Anytype/Sources/PresentationLayer/Modules/Chat/ChatViewModel.swift
index cd4a2ff1df..151f3d2282 100644
--- a/Anytype/Sources/PresentationLayer/Modules/Chat/ChatViewModel.swift
+++ b/Anytype/Sources/PresentationLayer/Modules/Chat/ChatViewModel.swift
@@ -256,11 +256,11 @@ final class ChatViewModel: MessageModuleOutput, ChatActionProviderHandler {
                 let prevChatIsEmpty = self.messages.isEmpty
                 
                 self.messages = messages
-                self.dataLoaded = true
                 if prevChatIsEmpty {
                     firstUnreadMessageOrderId = chatState?.messages.oldestOrderID
                 }
                 await updateMessages()
+                self.dataLoaded = true
                 if prevChatIsEmpty {
                     if let oldestOrderId = chatState?.messages.oldestOrderID, let message = messages.first(where: { $0.message.orderID == oldestOrderId}) {
                         collectionViewScrollProxy.scrollTo(itemId: message.message.id, position: .center, animated: false)