diff --git a/submodules/TelegramCore/Sources/State/ApplyUpdateMessage.swift b/submodules/TelegramCore/Sources/State/ApplyUpdateMessage.swift
index 1d7e8ecf57..a9955d762f 100644
--- a/submodules/TelegramCore/Sources/State/ApplyUpdateMessage.swift
+++ b/submodules/TelegramCore/Sources/State/ApplyUpdateMessage.swift
@@ -184,7 +184,9 @@ func applyUpdateMessage(postbox: Postbox, stateManager: AccountStateManager, mes
                                     sentStickers.append(file)
                                 }
                             case .Animated:
-                                sentGifs.append(file)
+                                if !file.isVideoSticker {
+                                    sentGifs.append(file)
+                                }
                             default:
                                 break
                             }
diff --git a/submodules/TelegramUI/Sources/ChatMessageReplyInfoNode.swift b/submodules/TelegramUI/Sources/ChatMessageReplyInfoNode.swift
index 198b13235d..3f75ac9223 100644
--- a/submodules/TelegramUI/Sources/ChatMessageReplyInfoNode.swift
+++ b/submodules/TelegramUI/Sources/ChatMessageReplyInfoNode.swift
@@ -128,7 +128,7 @@ class ChatMessageReplyInfoNode: ASDisplayNode {
                             imageDimensions = representation.dimensions.cgSize
                         }
                         break
-                    } else if let file = media as? TelegramMediaFile, file.isVideo {
+                    } else if let file = media as? TelegramMediaFile, file.isVideo && !file.isVideoSticker {
                         updatedMediaReference = .message(message: MessageReference(message), media: file)
                         
                         if let dimensions = file.dimensions {