diff --git a/SignalMessaging/Views/Mentions/MentionTextView.swift b/SignalMessaging/Views/Mentions/MentionTextView.swift
index cd87d24b78..2851502513 100644
--- a/SignalMessaging/Views/Mentions/MentionTextView.swift
+++ b/SignalMessaging/Views/Mentions/MentionTextView.swift
@@ -248,7 +248,13 @@ open class MentionTextView: OWSTextView {
 
         let animationTopConstraint = pickerView.autoPinEdge(.top, to: .top, of: pickerReferenceView)
 
-        didUpdateMentionText(currentlyTypingMentionText ?? "")
+        guard let currentlyTypingMentionText = currentlyTypingMentionText,
+            pickerView.mentionTextChanged(currentlyTypingMentionText) else {
+                pickerView.removeFromSuperview()
+                self.pickerView = nil
+                state = .notTypingMention
+                return
+        }
 
         let style = mentionDelegate.textViewMentionStyle(self)
         if style == .composingAttachment {