diff --git a/apps/remix/app/components/general/document/document-history-sheet.tsx b/apps/remix/app/components/general/document/document-history-sheet.tsx
index ef73c1c8f..991e90d61 100644
--- a/apps/remix/app/components/general/document/document-history-sheet.tsx
+++ b/apps/remix/app/components/general/document/document-history-sheet.tsx
@@ -361,6 +361,25 @@ export const DocumentHistorySheet = ({
                       ]}
                     />
                   ))
+                  .with(
+                    { type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_ATTACHMENTS_UPDATED },
+                    ({ data }) => (
+                      <DocumentHistorySheetChanges
+                        values={[
+                          {
+                            key: 'Old',
+                            value:
+                              data.from.map((attachment) => attachment.label).join(', ') || 'None',
+                          },
+                          {
+                            key: 'New',
+                            value:
+                              data.to.map((attachment) => attachment.label).join(', ') || 'None',
+                          },
+                        ]}
+                      />
+                    ),
+                  )
                   .exhaustive()}
 
                 {isUserDetailsVisible && (
diff --git a/packages/lib/server-only/document/update-document.ts b/packages/lib/server-only/document/update-document.ts
index 490f72af4..46e5da00d 100644
--- a/packages/lib/server-only/document/update-document.ts
+++ b/packages/lib/server-only/document/update-document.ts
@@ -242,7 +242,7 @@ export const updateDocument = async ({
     );
   }
 
-  if (data.attachments) {
+  if (!isAttachmentsSame) {
     auditLogs.push(
       createDocumentAuditLogData({
         type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_ATTACHMENTS_UPDATED,
@@ -250,7 +250,7 @@ export const updateDocument = async ({
         metadata: requestMetadata,
         data: {
           from: document.attachments,
-          to: data.attachments,
+          to: data.attachments ?? [],
         },
       }),
     );
diff --git a/packages/lib/types/document.ts b/packages/lib/types/document.ts
index 512b38fea..b5224fd78 100644
--- a/packages/lib/types/document.ts
+++ b/packages/lib/types/document.ts
@@ -64,6 +64,7 @@ export const ZDocumentSchema = DocumentSchema.pick({
     id: true,
     label: true,
     url: true,
+    type: true,
   })
     .array()
     .optional(),
diff --git a/packages/lib/utils/document-audit-logs.ts b/packages/lib/utils/document-audit-logs.ts
index d0884c342..ddaf7eacf 100644
--- a/packages/lib/utils/document-audit-logs.ts
+++ b/packages/lib/utils/document-audit-logs.ts
@@ -388,9 +388,9 @@ export const formatDocumentAuditLogAction = (
       anonymous: msg`Document completed`,
       identified: msg`Document completed`,
     }))
-    .with({ type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_ATTACHMENTS_UPDATED }, ({ data }) => ({
+    .with({ type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_ATTACHMENTS_UPDATED }, () => ({
       anonymous: msg`Document attachments updated`,
-      identified: msg`${prefix} updated the document attachments ${data.to.map((a) => a.label).join(', ')}`,
+      identified: msg`${prefix} updated the document attachments`,
     }))
     .exhaustive();
 
diff --git a/packages/ui/primitives/document-flow/add-settings.tsx b/packages/ui/primitives/document-flow/add-settings.tsx
index c6920a3e5..49e2ce957 100644
--- a/packages/ui/primitives/document-flow/add-settings.tsx
+++ b/packages/ui/primitives/document-flow/add-settings.tsx
@@ -171,7 +171,6 @@ export const AddSettingsFormPartial = ({
       formId: nanoid(12),
       label: '',
       url: '',
-      type: 'LINK',
     });
   };
 
diff --git a/packages/ui/primitives/document-flow/add-settings.types.ts b/packages/ui/primitives/document-flow/add-settings.types.ts
index 1b24452c0..481322a40 100644
--- a/packages/ui/primitives/document-flow/add-settings.types.ts
+++ b/packages/ui/primitives/document-flow/add-settings.types.ts
@@ -63,7 +63,6 @@ export const ZAddSettingsFormSchema = z.object({
     id: true,
     label: true,
     url: true,
-    type: true,
   })
     .extend({
       formId: z.string().min(1),