diff --git a/app/javascript/dashboard/components-next/message/Message.vue b/app/javascript/dashboard/components-next/message/Message.vue
index 54e5f5b5f..78f6cb0a6 100644
--- a/app/javascript/dashboard/components-next/message/Message.vue
+++ b/app/javascript/dashboard/components-next/message/Message.vue
@@ -151,6 +151,7 @@ const isMyMessage = computed(() => {
   const senderId = props.senderId ?? props.sender?.id;
   const senderType = props.senderType ?? props.sender?.type;
 
+  if (!senderType || !senderId) return false;
   return (
     senderType.toLowerCase() === SENDER_TYPES.USER.toLowerCase() &&
     props.currentUserId === senderId