diff --git a/ts/components/CompositionArea.tsx b/ts/components/CompositionArea.tsx
index 2c466535b95..bb53eaad0f4 100644
--- a/ts/components/CompositionArea.tsx
+++ b/ts/components/CompositionArea.tsx
@@ -180,7 +180,10 @@ export type OwnProps = Readonly<{
   quotedMessageAuthorAci: AciString | null;
   quotedMessageSentAt: number | null;
 
-  removeAttachment: (conversationId: string, filePath: string) => unknown;
+  removeAttachment: (
+    conversationId: string,
+    attachment: AttachmentDraftType
+  ) => unknown;
   scrollToMessage: (conversationId: string, messageId: string) => unknown;
   setComposerFocus: (conversationId: string) => unknown;
   setMessageToEdit(conversationId: string, messageId: string): unknown;
@@ -1172,9 +1175,7 @@ export const CompositionArea = memo(function CompositionArea({
               onClickAttachment={maybeEditAttachment}
               onClose={() => onClearAttachments(conversationId)}
               onCloseAttachment={attachment => {
-                if (attachment.path) {
-                  removeAttachment(conversationId, attachment.path);
-                }
+                removeAttachment(conversationId, attachment);
               }}
             />
           </div>
diff --git a/ts/state/ducks/composer.ts b/ts/state/ducks/composer.ts
index 632c16aa797..26f8c4c00ef 100644
--- a/ts/state/ducks/composer.ts
+++ b/ts/state/ducks/composer.ts
@@ -5,7 +5,6 @@ import path from 'node:path';
 import lodash from 'lodash';
 import type { ThunkAction, ThunkDispatch } from 'redux-thunk';
 import { v4 as generateUuid } from 'uuid';
-import { webUtils } from 'electron';
 
 import type { ReadonlyDeep } from 'type-fest';
 import type {
@@ -1036,7 +1035,10 @@ function processAttachments({
     const nextDraftAttachments = (
       conversation.get('draftAttachments') || []
     ).slice();
-    const filesToProcess: Array<File> = [];
+    const filesToProcess: Array<{
+      file: File;
+      pendingAttachment: AttachmentDraftType;
+    }> = [];
     for (let i = 0; i < files.length; i += 1) {
       const file = files[i];
       const processingResult = preProcessAttachment(file, nextDraftAttachments);
@@ -1050,7 +1052,7 @@ function processAttachments({
             getState,
             undefined
           );
-          filesToProcess.push(file);
+          filesToProcess.push({ file, pendingAttachment });
           // we keep a running count of the draft attachments so we can show a
           // toast in case we add too many attachments at once
           nextDraftAttachments.push(pendingAttachment);
@@ -1062,14 +1064,14 @@ function processAttachments({
 
     try {
       await Promise.all(
-        filesToProcess.map(async file => {
+        filesToProcess.map(async ({ file, pendingAttachment }) => {
           try {
             const attachment = await processAttachment(file, {
               generateScreenshot: true,
               flags,
             });
             if (!attachment) {
-              removeAttachment(conversationId, webUtils.getPathForFile(file))(
+              removeAttachment(conversationId, pendingAttachment)(
                 dispatch,
                 getState,
                 undefined
@@ -1086,7 +1088,7 @@ function processAttachments({
               'handleAttachmentsProcessing: failed to process attachment:',
               err.stack
             );
-            removeAttachment(conversationId, webUtils.getPathForFile(file))(
+            removeAttachment(conversationId, pendingAttachment)(
               dispatch,
               getState,
               undefined
@@ -1183,7 +1185,7 @@ function getPendingAttachment(file: File): AttachmentDraftType | undefined {
 
 function removeAttachment(
   conversationId: string,
-  filePath: string
+  draft: AttachmentDraftType
 ): ThunkAction<void, RootStateType, unknown, ReplaceAttachmentsActionType> {
   return async (dispatch, getState) => {
     const state = getState();
@@ -1193,16 +1195,21 @@ function removeAttachment(
       conversationId
     );
 
-    const [targetAttachment] = attachments.filter(
-      attachment => attachment.path === filePath
-    );
-    if (!targetAttachment) {
+    const targetAttachmentIndex = attachments.findIndex(attachment => {
+      return (
+        (attachment.clientUuid != null &&
+          attachment.clientUuid === draft.clientUuid) ||
+        (attachment.path != null && attachment.path === draft.path)
+      );
+    });
+    if (targetAttachmentIndex === -1) {
       return;
     }
 
-    const nextAttachments = attachments.filter(
-      attachment => attachment.path !== filePath
-    );
+    const targetAttachment = attachments[targetAttachmentIndex];
+    const nextAttachments = attachments
+      .slice(0, targetAttachmentIndex)
+      .concat(attachments.slice(targetAttachmentIndex + 1));
 
     const conversation = window.ConversationController.get(conversationId);
     if (conversation) {
diff --git a/ts/state/smart/CompositionRecordingDraft.tsx b/ts/state/smart/CompositionRecordingDraft.tsx
index d674ca748f5..2d02042ceda 100644
--- a/ts/state/smart/CompositionRecordingDraft.tsx
+++ b/ts/state/smart/CompositionRecordingDraft.tsx
@@ -99,14 +99,14 @@ export const SmartCompositionRecordingDraft = memo(
 
     const handleCancel = useCallback(() => {
       unloadMessageAudio();
-      if (selectedConversationId && voiceNoteAttachment.path) {
-        removeAttachment(selectedConversationId, voiceNoteAttachment.path);
+      if (selectedConversationId) {
+        removeAttachment(selectedConversationId, voiceNoteAttachment);
       }
     }, [
       removeAttachment,
       selectedConversationId,
       unloadMessageAudio,
-      voiceNoteAttachment.path,
+      voiceNoteAttachment,
     ]);
 
     const handleScrub = useCallback(