diff --git a/submodules/TelegramUI/Sources/ChatController.swift b/submodules/TelegramUI/Sources/ChatController.swift
index f912a5fbc9..d0ea5b689a 100644
--- a/submodules/TelegramUI/Sources/ChatController.swift
+++ b/submodules/TelegramUI/Sources/ChatController.swift
@@ -3492,8 +3492,13 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                         }
                     }
                 } else {
-                    pinnedMessageId = topPinnedMessage?.message.id
-                    pinnedMessage = topPinnedMessage
+                    if let pinnedMessageId = pinnedMessageId {
+                        if let message = messages?[pinnedMessageId] {
+                            pinnedMessage = ChatPinnedMessage(message: message, isLatest: true)
+                        }
+                    }
+                    //pinnedMessageId = topPinnedMessage?.message.id
+                    //pinnedMessage = topPinnedMessage
                 }
                 
                 var pinnedMessageUpdated = false