diff --git a/src/api/routes/channels/#channel_id/messages/#message_id/reactions.ts b/src/api/routes/channels/#channel_id/messages/#message_id/reactions.ts
index 558b5df0a..3484b288d 100644
--- a/src/api/routes/channels/#channel_id/messages/#message_id/reactions.ts
+++ b/src/api/routes/channels/#channel_id/messages/#message_id/reactions.ts
@@ -85,7 +85,7 @@ router.delete(
                 message_id,
                 guild_id: channel.guild_id,
             },
-        } as MessageReactionRemoveAllEvent);
+        } satisfies MessageReactionRemoveAllEvent);
 
         res.sendStatus(204);
     },
@@ -127,7 +127,7 @@ router.delete(
                     guild_id: message.guild_id,
                     emoji,
                 },
-            } as MessageReactionRemoveEmojiEvent),
+            } satisfies MessageReactionRemoveEmojiEvent),
         ]);
 
         res.sendStatus(204);
@@ -225,9 +225,10 @@ router.put(
 
         await message.save();
 
-        const member = (
-            await Member.findOneOrFail({
-                where: { id: req.user_id },
+        const member = channel.guild_id
+            ? (
+                  await Member.findOneOrFail({
+                      where: { id: req.user_id },
                 relations: { roles: true, user: true },
                 select: {
                     index: true,
@@ -237,8 +238,9 @@ router.put(
                         id: true,
                     },
                 },
-            })
-        ).toPublicMember();
+                  })
+              ).toPublicMember()
+            : undefined;
 
         await emitEvent({
             event: "MESSAGE_REACTION_ADD",