diff --git a/res/css/views/rooms/_EventBubbleTile.scss b/res/css/views/rooms/_EventBubbleTile.scss
index 42301025743..9cbad9fa4f7 100644
--- a/res/css/views/rooms/_EventBubbleTile.scss
+++ b/res/css/views/rooms/_EventBubbleTile.scss
@@ -249,6 +249,7 @@ limitations under the License.
 
         .mx_ReplyTile .mx_DisambiguatedProfile {
             display: block;
+            max-width: 100%;
         }
 
         .mx_ReactionsRow {
diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index 6e730597056..d531f3932b4 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -76,6 +76,7 @@ $threadInfoLineHeight: calc(2 * $font-12px); // See: _commons.scss
         > .mx_DisambiguatedProfile {
             line-height: $font-20px;
             margin-left: $left-gutter;
+            max-width: calc(100% - $left-gutter);
         }
 
         > .mx_EventTile_avatar {
@@ -152,7 +153,6 @@ $threadInfoLineHeight: calc(2 * $font-12px); // See: _commons.scss
         display: inline-block;
         padding-bottom: 0px;
         padding-top: 0px;
-        max-width: calc(100% - $left-gutter);
     }
 
     &.mx_EventTile_isEditing .mx_MessageTimestamp {
diff --git a/res/css/views/rooms/_IRCLayout.scss b/res/css/views/rooms/_IRCLayout.scss
index 6c0e70f7f14..cd481b2ee34 100644
--- a/res/css/views/rooms/_IRCLayout.scss
+++ b/res/css/views/rooms/_IRCLayout.scss
@@ -218,7 +218,6 @@ $irc-line-height: $font-18px;
         margin: 0;
         .mx_DisambiguatedProfile {
             order: unset;
-            max-width: unset;
             width: unset;
             background: transparent;
         }