diff --git a/js/models/conversations.js b/js/models/conversations.js
index c5724bae00..2b61a4d93c 100644
--- a/js/models/conversations.js
+++ b/js/models/conversations.js
@@ -1888,7 +1888,8 @@
       if (
         this.hasDraft() &&
         this.get('draftTimestamp') &&
-        previewMessage.get('sent_at') < this.get('draftTimestamp')
+        (!previewMessage ||
+          previewMessage.get('sent_at') < this.get('draftTimestamp'))
       ) {
         return;
       }
diff --git a/ts/state/smart/CompositionArea.tsx b/ts/state/smart/CompositionArea.tsx
index 7888f95272..eaa56f0d5f 100644
--- a/ts/state/smart/CompositionArea.tsx
+++ b/ts/state/smart/CompositionArea.tsx
@@ -72,13 +72,8 @@ const mapStateToProps = (state: StateType, props: ExternalProps) => {
     showIntroduction,
     showPickerHint,
     // Message Requests
-    messageRequestsEnabled: conversation.messageRequestsEnabled,
-    acceptedMessageRequest: conversation.acceptedMessageRequest,
-    isBlocked: conversation.isBlocked,
+    ...conversation,
     conversationType: conversation.type,
-    name: conversation.name,
-    profileName: conversation.profileName,
-    phoneNumber: conversation.phoneNumber,
   };
 };