From 2f11ce477832835cb69165cfeba81df910aeec2f Mon Sep 17 00:00:00 2001
From: Alexander Zinchuk <alx.zinchuk@gmail.com>
Date: Fri, 19 Sep 2025 14:34:39 +0200
Subject: [PATCH] Comments: Fix first message id on send (#6209)

---
 src/global/actions/api/chats.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/global/actions/api/chats.ts b/src/global/actions/api/chats.ts
index abc423c1a..c57af60c7 100644
--- a/src/global/actions/api/chats.ts
+++ b/src/global/actions/api/chats.ts
@@ -412,14 +412,19 @@ addActionHandler('openThread', async (global, actions, payload): Promise<void> =
       threadId,
     });
 
+    const lastMessageId = threadInfo?.lastMessageId !== undefined ? threadInfo.lastMessageId
+      : threadInfo?.messagesCount === 0 ? result.threadId : undefined;
+
     global = updateThreadInfo(global, chatId, threadId, {
       isCommentsInfo: false,
       threadId,
       chatId,
       fromChannelId: loadingChatId,
       fromMessageId: loadingThreadId,
+      lastMessageId,
       ...(threadInfo
-        && pick(threadInfo, ['messagesCount', 'lastMessageId', 'lastReadInboxMessageId', 'recentReplierIds'])),
+        && pick(threadInfo, ['messagesCount', 'lastReadInboxMessageId', 'recentReplierIds'])
+      ),
     });
   }
   global = updateThread(global, chatId, threadId, {