diff --git a/src/components/MessageDetails/MessageDetails.jsx b/src/components/MessageDetails/MessageDetails.jsx
index f8d14afd9..c56407958 100644
--- a/src/components/MessageDetails/MessageDetails.jsx
+++ b/src/components/MessageDetails/MessageDetails.jsx
@@ -61,6 +61,7 @@ class MessageDetails extends React.Component {
         <Comment
           key={idx}
           message={item}
+          author={item.author}
           avatarUrl={_.get(item, 'author.photoURL', null)}
           authorName={item.author ? (item.author.firstName + ' ' + item.author.lastName) : 'Connect user'}
           date={moment(item.date).fromNow()}
diff --git a/src/components/MessageList/MessagingEmptyState.jsx b/src/components/MessageList/MessagingEmptyState.jsx
index f36b9c951..656875e57 100644
--- a/src/components/MessageList/MessagingEmptyState.jsx
+++ b/src/components/MessageList/MessagingEmptyState.jsx
@@ -11,6 +11,8 @@ const MessagingEmptyState = ({ currentUser, onClose }) => (
         <CloseIcon />
       </a>
       <Comment
+        message=""
+        author=""
         avatarUrl={require('../../assets/images/avatar-coder.svg')}
         authorName="Coder the Bot"
         self={false}