diff --git a/submodules/Postbox/Sources/MessageHistoryView.swift b/submodules/Postbox/Sources/MessageHistoryView.swift
index f9e4792913..c3f80e1ef8 100644
--- a/submodules/Postbox/Sources/MessageHistoryView.swift
+++ b/submodules/Postbox/Sources/MessageHistoryView.swift
@@ -1069,28 +1069,30 @@ final class MutableMessageHistoryView: MutablePostboxView {
             }
         }
         
-        switch self.peerIds {
-        case let .single(peerId, threadId):
-            let location = PeerAndThreadId(peerId: peerId, threadId: threadId)
-            if let typingDraftUpdate = transaction.updatedTypingDrafts[location] {
-                if let typingDraft = typingDraftUpdate.value, self.namespaces.contains(typingDraft.namespace) {
-                    self.typingDraft = self.renderTypingDraft(postbox: postbox, typingDraft: typingDraft)
-                } else {
-                    self.typingDraft = nil
+        if self.tag == nil {
+            switch self.peerIds {
+            case let .single(peerId, threadId):
+                let location = PeerAndThreadId(peerId: peerId, threadId: threadId)
+                if let typingDraftUpdate = transaction.updatedTypingDrafts[location] {
+                    if let typingDraft = typingDraftUpdate.value, self.namespaces.contains(typingDraft.namespace) {
+                        self.typingDraft = self.renderTypingDraft(postbox: postbox, typingDraft: typingDraft)
+                    } else {
+                        self.typingDraft = nil
+                    }
+                    hasChanges = true
                 }
-                hasChanges = true
+            case .external:
+                break
+            case .associated:
+                break
             }
-        case .external:
-            break
-        case .associated:
-            break
         }
         
         return hasChanges
     }
     
     private func reloadTypingDraft(postbox: PostboxImpl) {
-        guard case let .single(peerId, threadId) = self.peerIds else {
+        guard case let .single(peerId, threadId) = self.peerIds, self.tag == nil else {
             self.typingDraft = nil
             return
         }