diff --git a/Packages/ComposeUI/Sources/ComposeUI/Controllers/AttachmentsListController.swift b/Packages/ComposeUI/Sources/ComposeUI/Controllers/AttachmentsListController.swift
index ee80b9a2b1..636970e3be 100644
--- a/Packages/ComposeUI/Sources/ComposeUI/Controllers/AttachmentsListController.swift
+++ b/Packages/ComposeUI/Sources/ComposeUI/Controllers/AttachmentsListController.swift
@@ -76,7 +76,9 @@ class AttachmentsListController: ViewController {
     }
     
     private func deleteAttachments(at indices: IndexSet) {
-        draft.attachments.removeObjects(at: indices)
+        var array = draft.draftAttachments
+        array.remove(atOffsets: indices)
+        draft.attachments = NSMutableOrderedSet(array: array)
     }
     
     private func insertAttachments(at offset: Int, itemProviders: [NSItemProvider]) {