diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
index 6ff11de17..ec9e05bb6 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
@@ -2977,6 +2977,13 @@ typedef enum : NSUInteger {
     didPickImageAttachments:(NSArray<SignalAttachment *> *)attachments
                 messageText:(NSString *_Nullable)messageText
 {
+    OWSAssert(self.isFirstResponder);
+    if (@available(iOS 10, *)) {
+        // do nothing
+    } else {
+        [self reloadInputViews];
+    }
+
     [self tryToSendAttachments:attachments messageText:messageText];
 }