diff --git a/lib/pages/chat/events/message/message.dart b/lib/pages/chat/events/message/message.dart
index 1edf72aa60..fcbf828d66 100644
--- a/lib/pages/chat/events/message/message.dart
+++ b/lib/pages/chat/events/message/message.dart
@@ -316,7 +316,8 @@ class _MessageState extends State<Message> {
       return const SizedBox();
     }
 
-    if (sameSender && !ownMessage) {
+    if (sameSender &&
+        (!ownMessage || !Message.responsiveUtils.isMobile(context))) {
       return Padding(
         padding: MessageStyle.paddingAvatar,
         child: FutureBuilder<User?>(
diff --git a/lib/pages/chat/events/message/message_content_with_timestamp_builder.dart b/lib/pages/chat/events/message/message_content_with_timestamp_builder.dart
index 7bd8a288c4..b5b403f23f 100644
--- a/lib/pages/chat/events/message/message_content_with_timestamp_builder.dart
+++ b/lib/pages/chat/events/message/message_content_with_timestamp_builder.dart
@@ -138,8 +138,7 @@ class MessageContentWithTimestampBuilder extends StatelessWidget {
                               Column(
                             crossAxisAlignment: CrossAxisAlignment.start,
                             children: [
-                              event.hideDisplayName(nextEvent) ||
-                                      event.hideDisplayNameInBubbleChat
+                              event.hideDisplayName(nextEvent)
                                   ? const SizedBox()
                                   : DisplayNameWidget(
                                       event: event,
diff --git a/lib/utils/matrix_sdk_extensions/event_extension.dart b/lib/utils/matrix_sdk_extensions/event_extension.dart
index 2102cd33a1..f0a31a54ac 100644
--- a/lib/utils/matrix_sdk_extensions/event_extension.dart
+++ b/lib/utils/matrix_sdk_extensions/event_extension.dart
@@ -177,7 +177,6 @@ extension LocalizedBody on Event {
       }.contains(messageType);
 
   bool hideDisplayName(Event? nextEvent) =>
-      isOwnMessage ||
       room.isDirectChat ||
       !isSameSenderWith(nextEvent) ||
       type == EventTypes.Encrypted;