diff --git a/TelegramUI/ChatMessageActionItemNode.swift b/TelegramUI/ChatMessageActionItemNode.swift
index f460a7c816..8c8132fc5a 100644
--- a/TelegramUI/ChatMessageActionItemNode.swift
+++ b/TelegramUI/ChatMessageActionItemNode.swift
@@ -467,7 +467,7 @@ class ChatMessageActionBubbleContentNode: ChatMessageBubbleContentNode {
     }
     
     override func transitionNode(messageId: MessageId, media: Media) -> (ASDisplayNode, () -> UIView?)? {
-        if let imageNode = self.imageNode {
+        if let imageNode = self.imageNode, self.item?.message.id == messageId {
             return (imageNode, { [weak imageNode] in
                 return imageNode?.view.snapshotContentTree(unhide: true)
             })