From d8c6008fa125b120cb64d0de40648c0619df45c3 Mon Sep 17 00:00:00 2001
From: automated-signal <37887102+automated-signal@users.noreply.github.com>
Date: Tue, 10 Mar 2026 14:18:11 -0500
Subject: [PATCH] preferContactAvatars: Only force re-rendering if initial sync
 complete

Co-authored-by: Scott Nonnenberg <scott@signal.org>
---
 ts/services/storageRecordOps.preload.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/ts/services/storageRecordOps.preload.ts b/ts/services/storageRecordOps.preload.ts
index b87d8d55c9..ecac74acbb 100644
--- a/ts/services/storageRecordOps.preload.ts
+++ b/ts/services/storageRecordOps.preload.ts
@@ -1695,7 +1695,13 @@ export async function mergeAccountRecord(
     const previous = itemStorage.get('preferContactAvatars');
     await itemStorage.put('preferContactAvatars', preferContactAvatars);
 
-    if (Boolean(previous) !== Boolean(preferContactAvatars)) {
+    const postRegistrationSyncsComplete =
+      itemStorage.get('postRegistrationSyncsStatus') !== 'incomplete';
+
+    if (
+      Boolean(previous) !== Boolean(preferContactAvatars) &&
+      postRegistrationSyncsComplete
+    ) {
       await window.ConversationController.forceRerender();
     }
   }