diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
index 640966f2d..1b874ca7f 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
@@ -987,9 +987,6 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) {
         _callOnOpen = NO;
     }
 
-    if (!self.viewHasEverAppeared) {
-        [self.inputToolbar endEditing:YES];
-    }
     self.viewHasEverAppeared = YES;
 }