diff --git a/server/queues/tasks/ExportDocumentTreeTask.ts b/server/queues/tasks/ExportDocumentTreeTask.ts
index fdf8f8d74..466a28d64 100644
--- a/server/queues/tasks/ExportDocumentTreeTask.ts
+++ b/server/queues/tasks/ExportDocumentTreeTask.ts
@@ -7,9 +7,9 @@ import { Collection } from "@server/models";
 import Attachment from "@server/models/Attachment";
 import Document from "@server/models/Document";
 import { DocumentHelper } from "@server/models/helpers/DocumentHelper";
+import { ProsemirrorHelper } from "@server/models/helpers/ProsemirrorHelper";
 import ZipHelper from "@server/utils/ZipHelper";
 import { serializeFilename } from "@server/utils/fs";
-import parseAttachmentIds from "@server/utils/parseAttachmentIds";
 import ExportTask from "./ExportTask";
 
 export default abstract class ExportDocumentTreeTask extends ExportTask {
@@ -48,7 +48,9 @@ export default abstract class ExportDocumentTreeTask extends ExportTask {
         : DocumentHelper.toMarkdown(document);
 
     const attachmentIds = includeAttachments
-      ? parseAttachmentIds(document.text)
+      ? ProsemirrorHelper.parseAttachmentIds(
+          DocumentHelper.toProsemirror(document)
+        )
       : [];
     const attachments = attachmentIds.length
       ? await Attachment.findAll({
diff --git a/server/routes/api/documents/documents.ts b/server/routes/api/documents/documents.ts
index 178b0480d..e539a919f 100644
--- a/server/routes/api/documents/documents.ts
+++ b/server/routes/api/documents/documents.ts
@@ -954,6 +954,7 @@ router.post(
         emoji: original.emoji,
         title: original.title,
         text: original.text,
+        content: original.content,
       },
       {
         transaction,