From 35236328b2ec6b11558c63a8017cbd4ddfff1439 Mon Sep 17 00:00:00 2001
From: John Livingston <git@john-livingston.fr>
Date: Mon, 12 May 2025 11:16:29 +0200
Subject: [PATCH] Fix #660: don't send headers twice on emoji router errors.

---
 CHANGELOG.md                 | 6 ++++++
 server/lib/routers/emojis.ts | 4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 71c32a44..d2cf7fa6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## (???) Not Released Yet
+
+### Minor changes and fixes
+
+* Fix #660: don't send headers twice on emoji router errors.
+
 ## 12.0.3
 
 ### Minor changes and fixes
diff --git a/server/lib/routers/emojis.ts b/server/lib/routers/emojis.ts
index 182eab0f..454f8608 100644
--- a/server/lib/routers/emojis.ts
+++ b/server/lib/routers/emojis.ts
@@ -78,7 +78,9 @@ export async function initEmojisRouter (
           },
           (err) => {
             if (err) {
-              res.sendStatus(404)
+              if (!res.headersSent) {
+                res.sendStatus(404)
+              }
             }
           }
         )