diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index facf904616..90c5809af8 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -99,6 +99,8 @@ $threadInfoLineHeight: calc(2 * $font-12px); // See: _commons.scss
     }
 
     &[data-layout=group] {
+        --EventTile_group_line-line-height: $font-22px;
+
         > .mx_DisambiguatedProfile {
             line-height: $font-20px;
             margin-left: $left-gutter;
@@ -124,7 +126,7 @@ $threadInfoLineHeight: calc(2 * $font-12px); // See: _commons.scss
             padding-top: 1px;
             padding-bottom: 3px;
             padding-left: $left-gutter;
-            line-height: $font-22px;
+            line-height: var(--EventTile_group_line-line-height);
         }
 
         .mx_EventTile_e2eIcon {
diff --git a/res/css/views/rooms/_ReplyTile.scss b/res/css/views/rooms/_ReplyTile.scss
index fe8e5bce48..3c78265813 100644
--- a/res/css/views/rooms/_ReplyTile.scss
+++ b/res/css/views/rooms/_ReplyTile.scss
@@ -18,7 +18,6 @@ limitations under the License.
     position: relative;
     padding: 2px 0;
     font-size: $font-14px;
-    line-height: $font-16px;
 
     &.mx_ReplyTile_audio .mx_MFileBody_info_icon::before {
         mask-image: url("$(res)/img/element-icons/speaker.svg");
@@ -60,16 +59,14 @@ limitations under the License.
     // We do reply size limiting with CSS to avoid duplicating the TextualBody component.
     .mx_EventTile_content {
         $reply-lines: 2;
-        $line-height: $font-22px;
 
         text-overflow: ellipsis;
         display: -webkit-box;
         -webkit-box-orient: vertical;
         -webkit-line-clamp: $reply-lines;
-        line-height: $line-height;
 
         .mx_EventTile_body.mx_EventTile_bigEmoji {
-            line-height: $line-height !important;
+            line-height: $font-22px !important; // Same as var(--EventTile_group_line-line-height)
             font-size: $font-14px !important; // Override the big emoji override
         }