diff --git a/ts/models/conversations.ts b/ts/models/conversations.ts
index c2ef438560..58d7ba7354 100644
--- a/ts/models/conversations.ts
+++ b/ts/models/conversations.ts
@@ -4160,9 +4160,10 @@ export class ConversationModel extends window.Backbone
           ? {}
           : {
               draft: '',
+              draftBodyRanges: [],
               draftTimestamp: null,
-              lastMessage: model.getNotificationText(),
               lastMessageAuthor: model.getAuthorText(),
+              lastMessage: model.getNotificationText(),
               lastMessageStatus: 'sending' as const,
             };
 
diff --git a/ts/state/ducks/composer.ts b/ts/state/ducks/composer.ts
index 45edca2681..7d43dd9fc6 100644
--- a/ts/state/ducks/composer.ts
+++ b/ts/state/ducks/composer.ts
@@ -74,6 +74,7 @@ import { useBoundActions } from '../../hooks/useBoundActions';
 import { scrollToMessage } from './conversations';
 import type { ScrollToMessageActionType } from './conversations';
 import { longRunningTaskWrapper } from '../../util/longRunningTaskWrapper';
+import { drop } from '../../util/drop';
 
 // State
 
@@ -384,12 +385,15 @@ function sendMultiMediaMessage(
         {
           sendHQImages,
           timestamp,
+          // We rely on enqueueMessageForSend to call these within redux's batch
           extraReduxActions: () => {
             conversation.setMarkedUnread(false);
             resetLinkPreview();
-            void clearConversationDraftAttachments(
-              conversationId,
-              draftAttachments
+            drop(
+              clearConversationDraftAttachments(
+                conversationId,
+                draftAttachments
+              )
             );
             setQuoteByMessageId(conversationId, undefined)(
               dispatch,