diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
index ea9f2cef0..81d44c74e 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
@@ -3831,6 +3831,7 @@ typedef enum : NSUInteger {
     NSString *newText = [oldText stringByReplacingCharactersInRange:NSMakeRange(mentionStartIndex, oldText.length - mentionStartIndex) withString:[NSString stringWithFormat:@"@%@", displayName]];
     [self.inputToolbar setMessageText:newText animated:NO];
     [self.inputToolbar hideUserSelectionView];
+    self.currentMentionStartIndex = -1;
 }
 
 - (NSString *)getSendText