diff --git a/src/components/common/embedded/EmbeddedMessage.tsx b/src/components/common/embedded/EmbeddedMessage.tsx
index bd0cdf245..c111bc06b 100644
--- a/src/components/common/embedded/EmbeddedMessage.tsx
+++ b/src/components/common/embedded/EmbeddedMessage.tsx
@@ -110,10 +110,10 @@ const EmbeddedMessage: FC<OwnProps> = ({
 
   const senderTitle = sender ? getSenderTitle(lang, sender)
     : (replyForwardInfo?.hiddenUserName || message?.forwardInfo?.hiddenUserName);
-  const senderChatTitle = senderChat ? getSenderTitle(lang, senderChat) : message?.forwardInfo?.hiddenUserName;
+  const senderChatTitle = senderChat ? getSenderTitle(lang, senderChat) : undefined;
   const forwardSenderTitle = forwardSender ? getSenderTitle(lang, forwardSender)
     : message?.forwardInfo?.hiddenUserName;
-  const areSendersSame = sender?.id === forwardSender?.id;
+  const areSendersSame = sender && sender.id === forwardSender?.id;
 
   const { handleClick, handleMouseDown } = useFastClick(onClick);
 
@@ -174,7 +174,7 @@ const EmbeddedMessage: FC<OwnProps> = ({
       }
     }
 
-    const isChatSender = senderChat?.id === sender?.id;
+    const isChatSender = senderChat && senderChat.id === sender?.id;
     const isReplyToQuote = isInComposer && Boolean(replyInfo && 'quoteText' in replyInfo && replyInfo?.quoteText);
 
     return (