diff --git a/TelegramUI/ChatMessageInteractiveMediaNode.swift b/TelegramUI/ChatMessageInteractiveMediaNode.swift
index a44541d503..ed6e45c3b5 100644
--- a/TelegramUI/ChatMessageInteractiveMediaNode.swift
+++ b/TelegramUI/ChatMessageInteractiveMediaNode.swift
@@ -260,7 +260,7 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode {
                     
                     var mediaUpdated = false
                     if let currentMedia = currentMedia {
-                        mediaUpdated = !media.isEqual(to: currentMedia)
+                        mediaUpdated = !media.isSemanticallyEqual(to: currentMedia)
                     } else {
                         mediaUpdated = true
                     }
@@ -318,7 +318,7 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode {
                                 if file.isSticker {
                                     updateImageSignal = chatMessageSticker(account: account, file: file, small: false)
                                 } else {
-                                    updateImageSignal = mediaGridMessageVideo(postbox: account.postbox, videoReference: .message(message: MessageReference(message), media: file), onlyFullSize: currentMedia != nil)
+                                    updateImageSignal = mediaGridMessageVideo(postbox: account.postbox, videoReference: .message(message: MessageReference(message), media: file), onlyFullSize: currentMedia?.id?.namespace == Namespaces.Media.LocalFile)
                                 }
                             }
                             
diff --git a/TelegramUI/UrlHandling.swift b/TelegramUI/UrlHandling.swift
index 9938f8fe14..8c4b76894e 100644
--- a/TelegramUI/UrlHandling.swift
+++ b/TelegramUI/UrlHandling.swift
@@ -168,10 +168,10 @@ private func resolveInternalUrl(account: Account, url: ParsedInternalUrl) -> Sig
                                 return .channelMessage(peerId: peer.id, messageId: MessageId(peerId: peer.id, namespace: Namespaces.Message.Cloud, id: id))
                         }
                     } else {
-                        if let peer = peer as? TelegramUser, peer.botInfo != nil {
-                            return .peer(peer.id, .chat(textInputState: nil, messageId: nil))
-                        } else {
+                        if let peer = peer as? TelegramUser, peer.botInfo == nil {
                             return .peer(peer.id, .info)
+                        } else {
+                            return .peer(peer.id, .chat(textInputState: nil, messageId: nil))
                         }
                     }
                 } else {