diff --git a/src/components/structures/MessagePanel.tsx b/src/components/structures/MessagePanel.tsx
index 5bfe759508..4ca38266dd 100644
--- a/src/components/structures/MessagePanel.tsx
+++ b/src/components/structures/MessagePanel.tsx
@@ -712,6 +712,8 @@ export default class MessagePanel extends React.Component<IProps, IState> {
 
         const callEventGrouper = this.callEventGroupers.get(mxEv.getContent().call_id);
 
+        const isDirectMessage = this.props.room?.getJoinedMemberCount() <= 2;
+
         // use txnId as key if available so that we don't remount during sending
         ret.push(
             <TileErrorBoundary key={mxEv.getTxnId() || eventId} mxEvent={mxEv}>
@@ -743,7 +745,7 @@ export default class MessagePanel extends React.Component<IProps, IState> {
                     enableFlair={this.props.enableFlair}
                     showReadReceipts={this.props.showReadReceipts}
                     callEventGrouper={callEventGrouper}
-                    hideSender={this.props.room?.getMembers().length <= 2 && this.props.layout === Layout.Bubble}
+                    hideSender={isDirectMessage && this.props.layout === Layout.Bubble}
                 />
             </TileErrorBoundary>,
         );