diff --git a/plugins/attachment-resources/src/components/AttachmentStyledBox.svelte b/plugins/attachment-resources/src/components/AttachmentStyledBox.svelte
index abac7d15b2..c2844968e0 100644
--- a/plugins/attachment-resources/src/components/AttachmentStyledBox.svelte
+++ b/plugins/attachment-resources/src/components/AttachmentStyledBox.svelte
@@ -234,7 +234,9 @@
       promises.push(deleteAttachment(p))
     })
     await Promise.all(promises)
-    saveDraft()
+    removeDraft(false)
+    newAttachments.clear()
+    removedAttachments.clear()
   }
 
   $: if (attachments.size || newAttachments.size || removedAttachments.size) {
diff --git a/plugins/tracker-resources/src/components/issues/edit/EditIssue.svelte b/plugins/tracker-resources/src/components/issues/edit/EditIssue.svelte
index 4edc1a00ce..3716f2e922 100644
--- a/plugins/tracker-resources/src/components/issues/edit/EditIssue.svelte
+++ b/plugins/tracker-resources/src/components/issues/edit/EditIssue.svelte
@@ -112,15 +112,7 @@
     }
 
     if (Object.keys(updates).length > 0) {
-      await client.updateCollection(
-        issue._class,
-        issue.space,
-        issue._id,
-        issue.attachedTo,
-        issue.attachedToClass,
-        issue.collection,
-        updates
-      )
+      await client.update(issue, updates)
       saved = true
       setTimeout(() => {
         saved = false
@@ -190,7 +182,6 @@
         _class={tracker.class.Issue}
         space={issue.space}
         alwaysEdit
-        shouldSaveDraft={true}
         on:attached={save}
         on:detached={save}
         showButtons