diff --git a/src/components/common/messaging/Message.tsx b/src/components/common/messaging/Message.tsx
index 1765fb5f..778e932c 100644
--- a/src/components/common/messaging/Message.tsx
+++ b/src/components/common/messaging/Message.tsx
@@ -96,7 +96,7 @@ const Message = observer(
                             key={message_id}
                             index={index}
                             id={message_id}
-                            channel={message.channel!}
+                            channel={message.channel}
                             parent_mentions={message.mention_ids ?? []}
                         />
                     ))}
diff --git a/src/components/common/messaging/attachments/MessageReply.tsx b/src/components/common/messaging/attachments/MessageReply.tsx
index 4465d42a..ce6489e4 100644
--- a/src/components/common/messaging/attachments/MessageReply.tsx
+++ b/src/components/common/messaging/attachments/MessageReply.tsx
@@ -18,7 +18,7 @@ import { SystemMessage } from "../SystemMessage";
 
 interface Props {
     parent_mentions: string[];
-    channel: Channel;
+    channel?: Channel;
     index: number;
     id: string;
 }
@@ -148,6 +148,8 @@ export const ReplyBase = styled.div<{
 
 export const MessageReply = observer(
     ({ index, channel, id, parent_mentions }: Props) => {
+        if (!channel) return null;
+
         const view = getRenderer(channel);
         if (view.state !== "RENDER") return null;