diff --git a/src/api/gramjs/methods/chats.ts b/src/api/gramjs/methods/chats.ts
index 945b01b26..3ed79b0bd 100644
--- a/src/api/gramjs/methods/chats.ts
+++ b/src/api/gramjs/methods/chats.ts
@@ -277,23 +277,17 @@ export async function requestChatUpdate({
 
   updateLocalDb(result);
 
-  let lastMessage: ApiMessage | undefined;
-  if (!noLastMessage) {
-    const lastRemoteMessage = buildApiMessage(result.messages[0]);
-
-    if (lastLocalMessage && (!lastRemoteMessage || (lastLocalMessage.date > lastRemoteMessage.date))) {
-      lastMessage = lastLocalMessage;
-    } else {
-      lastMessage = lastRemoteMessage;
-    }
-  }
+  const lastRemoteMessage = buildApiMessage(result.messages[0]);
+  const lastMessage = lastLocalMessage && (!lastRemoteMessage || (lastLocalMessage.date > lastRemoteMessage.date))
+    ? lastLocalMessage
+    : lastRemoteMessage;
 
   onUpdate({
     '@type': 'updateChat',
     id,
     chat: {
       ...buildApiChatFromDialog(dialog, peerEntity, serverTimeOffset),
-      ...(lastMessage && { lastMessage }),
+      ...(!noLastMessage && { lastMessage }),
     },
   });
 }