diff --git a/lib/pages/chat/events/html_message.dart b/lib/pages/chat/events/html_message.dart
index d6e7d98114..f7189aa397 100644
--- a/lib/pages/chat/events/html_message.dart
+++ b/lib/pages/chat/events/html_message.dart
@@ -180,7 +180,8 @@ class HtmlMessage extends StatelessWidget {
final user = room.getUser(identifier);
final displayName = user?.displayName ?? identifier;
return MentionedUser(
- displayName: displayName.displayMentioned,
+ displayName:
+ !room.isDirectChat ? displayName.displayMentioned : displayName,
url: url,
onTap: !room.isDirectChat ? onTap : null,
textStyle: !room.isDirectChat
diff --git a/lib/pages/chat/input_bar/input_bar.dart b/lib/pages/chat/input_bar/input_bar.dart
index ec998cd63c..1ebac66e21 100644
--- a/lib/pages/chat/input_bar/input_bar.dart
+++ b/lib/pages/chat/input_bar/input_bar.dart
@@ -41,6 +41,7 @@ class InputBar extends StatefulWidget {
final ValueKey? typeAheadKey;
final ValueNotifier? showEmojiPickerNotifier;
final SuggestionsController