diff --git a/submodules/TelegramUI/Sources/ChatMessageAnimatedStickerItemNode.swift b/submodules/TelegramUI/Sources/ChatMessageAnimatedStickerItemNode.swift
index bb8661d00b..b12383fd6d 100644
--- a/submodules/TelegramUI/Sources/ChatMessageAnimatedStickerItemNode.swift
+++ b/submodules/TelegramUI/Sources/ChatMessageAnimatedStickerItemNode.swift
@@ -1643,10 +1643,19 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView {
     }
     
     private func commitEnqueuedAnimations() {
-        guard let item = self.item, let file = self.emojiFile, !self.enqueuedAdditionalAnimations.isEmpty else {
+        guard let item = self.item,  !self.enqueuedAdditionalAnimations.isEmpty else {
             return
         }
         
+        guard let file = self.emojiFile else {
+            return
+        }
+        
+        var emojiFile = self.emojiFile
+        if emojiFile == nil {
+            emojiFile = item.message.associatedMedia.first?.value as? TelegramMediaFile
+        }
+        
         let enqueuedAnimations = self.enqueuedAdditionalAnimations
         self.enqueuedAdditionalAnimations.removeAll()
         
@@ -2630,7 +2639,7 @@ private func fontSizeForEmojiString(_ string: String) -> CGFloat {
     
     var maxLineLength = 0
     for line in lines {
-        maxLineLength = max(maxLineLength, line.count)
+        maxLineLength = max(maxLineLength, line.replacingOccurrences(of: " ", with: "").count)
     }
     
     let linesCount = lines.count