From 1ae91c87d05b5fa32becb2f64939f7856b3628a7 Mon Sep 17 00:00:00 2001
From: Jason Robinson <jasonr@element.io>
Date: Tue, 2 Jun 2026 21:36:00 +0300
Subject: [PATCH] Fix `get_profile_data_for_users` if user does not have custom
 fields

---
 synapse/storage/databases/main/profile.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/synapse/storage/databases/main/profile.py b/synapse/storage/databases/main/profile.py
index e70443fa77..0e96d1a966 100644
--- a/synapse/storage/databases/main/profile.py
+++ b/synapse/storage/databases/main/profile.py
@@ -455,7 +455,7 @@ class ProfileWorkerStore(SQLBaseStore):
 
         results: dict[str, dict[str, str | JsonDict | None]] = {}
         for full_user_id, displayname, avatar_url, fields in rows:
-            user_fields = fields
+            user_fields = fields or {}
             # The SQLite driver doesn't automatically convert JSON to
             # Python objects
             if isinstance(self.database_engine, Sqlite3Engine) and fields: