diff --git a/src/smart-components/Conversation/components/MessageHOC.jsx b/src/smart-components/Conversation/components/MessageHOC.jsx
index ff6c7172b..2520a3ef1 100644
--- a/src/smart-components/Conversation/components/MessageHOC.jsx
+++ b/src/smart-components/Conversation/components/MessageHOC.jsx
@@ -89,7 +89,7 @@ export default function MessageHoc({
     return null;
   }, [message, message.message, renderCustomMessage]);
 
-  const isByMe = (userId === sender.userId)
+  const isByMe = (userId === sender?.userId)
     || (message.requestState === 'pending')
     || (message.requestState === 'failed');