diff --git a/Signal/src/ViewControllers/ConversationView/ConversationInputTextView.m b/Signal/src/ViewControllers/ConversationView/ConversationInputTextView.m
index a1b12a7e8..c1f1d3b79 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationInputTextView.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationInputTextView.m
@@ -173,7 +173,6 @@ NS_ASSUME_NONNULL_BEGIN
     return [self.text ows_stripped];
 }
 
-
 #pragma mark - UITextViewDelegate
 
 - (void)textViewDidBeginEditing:(UITextView *)textView
diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
index 3096fa051..aa29cc8bd 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
@@ -459,7 +459,6 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) {
         [self.inputToolbar endEditing:TRUE];
     } else {
         self.inputToolbar.hidden = NO;
-        [self loadDraftInCompose];
     }
 }
 
@@ -477,6 +476,7 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) {
     [self createHeaderViews];
     [self createBackButton];
     [self addNotificationListeners];
+    [self loadDraftInCompose];
 }
 
 - (void)createContents