diff --git a/TelegramUI/ChatMessageItem.swift b/TelegramUI/ChatMessageItem.swift
index 5a63f7f0d2..2c62839092 100644
--- a/TelegramUI/ChatMessageItem.swift
+++ b/TelegramUI/ChatMessageItem.swift
@@ -352,7 +352,7 @@ public final class ChatMessageItem: ListViewItem, CustomStringConvertible {
             }
         }
         
-        if viewClassName == ChatMessageBubbleItemNode.self, self.message.text.containsOnlyEmoji && self.presentationData.largeEmoji, self.message.text.emojis.count < 4 {
+        if viewClassName == ChatMessageBubbleItemNode.self, !self.message.text.isEmpty && self.message.text.containsOnlyEmoji && self.presentationData.largeEmoji, self.message.text.emojis.count < 4 {
             viewClassName = ChatMessageStickerItemNode.self
         }
         
diff --git a/TelegramUI/DebugController.swift b/TelegramUI/DebugController.swift
index e1b158a396..7df9e36afc 100644
--- a/TelegramUI/DebugController.swift
+++ b/TelegramUI/DebugController.swift
@@ -172,7 +172,9 @@ private enum DebugControllerEntry: ItemListNodeEntry {
                                     if let strongController = controller {
                                         strongController.dismiss()
                                         
-                                        let messages = logs.map { (name, path) -> EnqueueMessage in
+                                        let updatedLogs = logs.last.flatMap({ [$0] }) ?? []
+                                        
+                                        let messages = updatedLogs.map { (name, path) -> EnqueueMessage in
                                             let id = arc4random64()
                                             let file = TelegramMediaFile(fileId: MediaId(namespace: Namespaces.Media.LocalFile, id: id), partialReference: nil, resource: LocalFileReferenceMediaResource(localFilePath: path, randomId: id), previewRepresentations: [], immediateThumbnailData: nil, mimeType: "application/text", size: nil, attributes: [.FileName(fileName: name)])
                                             return .message(text: "", attributes: [], mediaReference: .standalone(media: file), replyToMessageId: nil, localGroupingKey: nil)
@@ -201,24 +203,6 @@ private enum DebugControllerEntry: ItemListNodeEntry {
                             ])
                         ])
                         arguments.presentController(actionSheet, nil)
-                        
-                        
-                        let controller = PeerSelectionController(context: context)
-                        controller.peerSelected = { [weak controller] peerId in
-                            if let strongController = controller {
-                                strongController.dismiss()
-                                
-                                let updatedLogs = logs.last.flatMap({ [$0] }) ?? []
-                                
-                                let messages = updatedLogs.map { (name, path) -> EnqueueMessage in
-                                    let id = arc4random64()
-                                    let file = TelegramMediaFile(fileId: MediaId(namespace: Namespaces.Media.LocalFile, id: id), partialReference: nil, resource: LocalFileReferenceMediaResource(localFilePath: path, randomId: id), previewRepresentations: [], immediateThumbnailData: nil, mimeType: "application/text", size: nil, attributes: [.FileName(fileName: name)])
-                                    return .message(text: "", attributes: [], mediaReference: .standalone(media: file), replyToMessageId: nil, localGroupingKey: nil)
-                                }
-                                let _ = enqueueMessages(account: context.account, peerId: peerId, messages: messages).start()
-                            }
-                        }
-                        arguments.presentController(controller, ViewControllerPresentationArguments(presentationAnimation: ViewControllerPresentationAnimation.modalSheet))
                     })
                 })
             case let .sendNotificationLogs(theme):