diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageItem.swift b/submodules/TelegramUI/TelegramUI/ChatMessageItem.swift
index c019eb9860..8f11c17388 100644
--- a/submodules/TelegramUI/TelegramUI/ChatMessageItem.swift
+++ b/submodules/TelegramUI/TelegramUI/ChatMessageItem.swift
@@ -386,10 +386,10 @@ public final class ChatMessageItem: ListViewItem, CustomStringConvertible {
             }
         }
         
-        if viewClassName == ChatMessageBubbleItemNode.self && self.presentationData.largeEmoji && messageIsElligibleForLargeEmoji(self.message) {
-            if let _ = self.associatedData.animatedEmojiStickers[self.message.text.basicEmoji.0] {
+        if viewClassName == ChatMessageBubbleItemNode.self && self.presentationData.largeEmoji {
+            if self.message.text.count == 1, let _ = self.associatedData.animatedEmojiStickers[self.message.text.basicEmoji.0] {
                 viewClassName = ChatMessageAnimatedStickerItemNode.self
-            } else {
+            } else if messageIsElligibleForLargeEmoji(self.message) {
                 viewClassName = ChatMessageStickerItemNode.self
             }
         }
diff --git a/submodules/TelegramUI/TelegramUI/EmojiUtils.swift b/submodules/TelegramUI/TelegramUI/EmojiUtils.swift
index 6f00f6b78c..42cc09e558 100644
--- a/submodules/TelegramUI/TelegramUI/EmojiUtils.swift
+++ b/submodules/TelegramUI/TelegramUI/EmojiUtils.swift
@@ -19,8 +19,6 @@ extension UnicodeScalar {
                 return true
             case 0x1f004:
                 return true
-            case 0x2764:
-                return true
             case 0x270b, 0x2728:
                 return true
             default: