From c98a346b0cf47b458ec68c9bdbae31a824dba06f Mon Sep 17 00:00:00 2001
From: trevor-signal <131492920+trevor-signal@users.noreply.github.com>
Date: Wed, 17 Sep 2025 13:38:34 -0400
Subject: [PATCH] Avoid foreign key error if message is deleted before saving
 attachments

---
 ts/sql/Server.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ts/sql/Server.ts b/ts/sql/Server.ts
index e2aa018e3d3..8dccd542682 100644
--- a/ts/sql/Server.ts
+++ b/ts/sql/Server.ts
@@ -2997,10 +2997,6 @@ function saveMessage(
   } satisfies Omit<MessageTypeUnhydrated, 'json'>;
 
   if (id && !forceSave) {
-    if (normalizeAttachmentData) {
-      saveMessageAttachments(db, message);
-    }
-
     const result = db
       .prepare(
         // UPDATE queries that set the value of a primary key column can be very slow when
@@ -3019,6 +3015,10 @@ function saveMessage(
       return id;
     }
 
+    if (normalizeAttachmentData) {
+      saveMessageAttachments(db, message);
+    }
+
     if (jobToInsert) {
       insertJob(db, jobToInsert);
     }