diff --git a/src/views/Conversations/Online/Components/BubbleIM.jsx b/src/views/Conversations/Online/Components/BubbleIM.jsx
index 8623574..7b3bed8 100644
--- a/src/views/Conversations/Online/Components/BubbleIM.jsx
+++ b/src/views/Conversations/Online/Components/BubbleIM.jsx
@@ -118,7 +118,7 @@ const BubbleIM = ({ handlePreview, handleContactClick, setNewChatModalVisible, s
         ? {
             // styles: { backgroundColor: '#ccd4ae' },
             notchStyle: { fill: outboundStyle[message.msg_source.toLowerCase()].color },
-            title: <><ChannelLogo channel={message.msg_source} />&nbsp;{message.wabaName}&nbsp;-&nbsp;{message.title}</>,
+            title: <><ChannelLogo channel={message.msg_source} />{message.wabaName ? ` ${message.wabaName} - ${message.title}` : ` ${message.title || message.from}`}</>,
           }
         : {
           // title: <>&nbsp;<ChannelLogo channel={message.msg_source} />&nbsp;{message.title}</>,