diff --git a/src/api/routes/webhooks/#webhook_id/#webhook_token/messages/#message_id.ts b/src/api/routes/webhooks/#webhook_id/#webhook_token/messages/#message_id.ts
index 578730e44..798752f08 100644
--- a/src/api/routes/webhooks/#webhook_id/#webhook_token/messages/#message_id.ts
+++ b/src/api/routes/webhooks/#webhook_id/#webhook_token/messages/#message_id.ts
@@ -109,8 +109,8 @@ router.patch(
             author: new_message.author!.toPartialUser(),
             attachments: new_message.attachments?.map((x) => x.toJSON()) ?? [],
             embeds: new_message.embeds,
-            mentions: new_message.mentions.map((u) => u.toPartialUser()),
-            mention_roles: new_message.mention_roles.map((r) => r.id),
+            mentions: new_message.mentions?.map((u) => u.toPartialUser()) ?? [],
+            mention_roles: new_message.mention_roles?.map((r) => r.id) ?? [],
             mention_everyone: new_message.mention_everyone ?? false,
             pinned: new_message.pinned,
             timestamp: new_message.timestamp.toISOString(),