From 00c2089e81ebdd4a94612f1bed7d143fc2772bb3 Mon Sep 17 00:00:00 2001
From: Gomasy <nyan@gomasy.jp>
Date: Mon, 4 May 2026 18:09:17 +0900
Subject: [PATCH] Fix emoji picker not rendering when no custom emojis (#38885)

---
 app/javascript/mastodon/features/emoji/picker.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/features/emoji/picker.ts b/app/javascript/mastodon/features/emoji/picker.ts
index b40a3020e4..ad7baa2993 100644
--- a/app/javascript/mastodon/features/emoji/picker.ts
+++ b/app/javascript/mastodon/features/emoji/picker.ts
@@ -29,7 +29,8 @@ export async function fetchCustomEmojiData() {
   const { loadAllCustomEmoji } = await import('./database');
   const emojisRaw = await loadAllCustomEmoji();
   if (emojisRaw.length === 0) {
-    return [];
+    customEmojis = [];
+    return customEmojis;
   }
 
   const categories = new Set(['custom']);