From 4b072217b2bfb5d56ab060e2790ddf8abbd19ec6 Mon Sep 17 00:00:00 2001
From: trevor-signal <131492920+trevor-signal@users.noreply.github.com>
Date: Wed, 18 Mar 2026 17:21:42 -0700
Subject: [PATCH] Exclude chatItems without an author during export

---
 ts/services/backups/export.preload.ts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/ts/services/backups/export.preload.ts b/ts/services/backups/export.preload.ts
index e1b44c3317..3591f04341 100644
--- a/ts/services/backups/export.preload.ts
+++ b/ts/services/backups/export.preload.ts
@@ -1515,6 +1515,13 @@ export class BackupExportStream extends Readable {
     const me = this.#getRecipientByServiceId(aboutMe.aci, 'getting self');
     strictAssert(me, 'self recipient must exist');
 
+    if (chatItem?.authorId == null) {
+      log.warn(`${message.sent_at}: Dropping message without known author`);
+      return undefined;
+    }
+
+    strictAssert(chatItem.authorId !== 0n, 'authorId 0 is invalid');
+
     if (
       chatItem &&
       conversation &&