diff --git a/Telegram/Telegram-iOS/en.lproj/Localizable.strings b/Telegram/Telegram-iOS/en.lproj/Localizable.strings
index 0d58780b9d..c28d37a99f 100644
--- a/Telegram/Telegram-iOS/en.lproj/Localizable.strings
+++ b/Telegram/Telegram-iOS/en.lproj/Localizable.strings
@@ -12214,6 +12214,7 @@ Sorry for the inconvenience.";
 
 "FactCheck.Title" = "Fact Check";
 "FactCheck.Placeholder" = "Add Fact Check";
+"FactCheck.Remove" = "Remove";
 
 "Conversation.ContextMenuAddFactCheck" = "Add Fact Check";
 "Conversation.ContextMenuEditFactCheck" = "Edit Fact Check";
diff --git a/submodules/TelegramUI/Components/Chat/ChatMessageBubbleItemNode/Sources/ChatMessageBubbleItemNode.swift b/submodules/TelegramUI/Components/Chat/ChatMessageBubbleItemNode/Sources/ChatMessageBubbleItemNode.swift
index 36e890b910..b47316f0f0 100644
--- a/submodules/TelegramUI/Components/Chat/ChatMessageBubbleItemNode/Sources/ChatMessageBubbleItemNode.swift
+++ b/submodules/TelegramUI/Components/Chat/ChatMessageBubbleItemNode/Sources/ChatMessageBubbleItemNode.swift
@@ -209,12 +209,8 @@ private func contentNodeMessagesAndClassesForItem(_ item: ChatMessageItem) -> ([
                 if let _ = invoice.extendedMedia {
                     result.append((message, ChatMessageMediaBubbleContentNode.self, itemAttributes, BubbleItemAttributes(isAttachment: false, neighborType: .media, neighborSpacing: .default)))
                 } else {
-                    if invoice.currency == "XTR" {
-                        result.append((message, ChatMessageTextBubbleContentNode.self, itemAttributes, BubbleItemAttributes(isAttachment: false, neighborType: .text, neighborSpacing: .default)))
-                    } else {
-                        skipText = true
-                        result.append((message, ChatMessageInvoiceBubbleContentNode.self, itemAttributes, BubbleItemAttributes(isAttachment: false, neighborType: .text, neighborSpacing: .default)))
-                    }
+                    skipText = true
+                    result.append((message, ChatMessageInvoiceBubbleContentNode.self, itemAttributes, BubbleItemAttributes(isAttachment: false, neighborType: .text, neighborSpacing: .default)))
                 }
                 needReactions = false
                 break inner
diff --git a/submodules/TelegramUI/Sources/Chat/ChatControllerOpenMessageFactCheck.swift b/submodules/TelegramUI/Sources/Chat/ChatControllerOpenMessageFactCheck.swift
index c8890dfc3f..3fefe30c17 100644
--- a/submodules/TelegramUI/Sources/Chat/ChatControllerOpenMessageFactCheck.swift
+++ b/submodules/TelegramUI/Sources/Chat/ChatControllerOpenMessageFactCheck.swift
@@ -20,7 +20,11 @@ extension ChatControllerImpl {
             guard let self else {
                 return
             }
-            let _ = self.context.engine.messages.editMessageFactCheck(messageId: messageId, text: text, entities: entities).startStandalone()
+            if !currentText.isEmpty && text.isEmpty {
+                let _ = self.context.engine.messages.deleteMessageFactCheck(messageId: messageId).startStandalone()
+            } else {
+                let _ = self.context.engine.messages.editMessageFactCheck(messageId: messageId, text: text, entities: entities).startStandalone()
+            }
         })
         self.present(controller, in: .window(.root))
     }