diff --git a/apps/Frontend/src/components/claims/claim-form.tsx b/apps/Frontend/src/components/claims/claim-form.tsx
index bd7275f1..7cc16cfb 100755
--- a/apps/Frontend/src/components/claims/claim-form.tsx
+++ b/apps/Frontend/src/components/claims/claim-form.tsx
@@ -1023,10 +1023,11 @@ export function ClaimForm({
       insuranceSiteKey: "MH",
       claimId: createdClaim.id,
       uploadedFiles,
-      // Chatbot-driven submissions already include every file the user intends to send —
-      // skip the backend's appointment-attachment fallback merge so old files saved on the
-      // appointment (e.g. via the Schedule editor) aren't silently added as extra uploads.
-      skipAppointmentAttachmentMerge: !!autoSubmit,
+      // Only skip the backend's appointment-attachment fallback merge when this automated
+      // submission already supplied its own files — otherwise files saved directly on the
+      // appointment (e.g. a screenshot attached via the Schedule editor) would never reach
+      // the insurance upload at all.
+      skipAppointmentAttachmentMerge: !!autoSubmit && !!uploadedFiles?.length,
     });
 
     // 5. Close form