diff --git a/webroot/js/components/chat/chat-message-view.js b/webroot/js/components/chat/chat-message-view.js
index adf7166e2..17459e7ef 100644
--- a/webroot/js/components/chat/chat-message-view.js
+++ b/webroot/js/components/chat/chat-message-view.js
@@ -48,9 +48,9 @@ export default class ChatMessageView extends Component {
       return null;
     }
     const formattedTimestamp = `Sent at ${formatTimestamp(timestamp)}`;
-    const userMetadata = `${displayName} first joined ${formatTimestamp(
+    const userMetadata = createdAt ? `${displayName} first joined ${formatTimestamp(
       createdAt
-    )}`;
+    )}` : null;
 
     const isSystemMessage = message.type === SOCKET_MESSAGE_TYPES.SYSTEM;