diff --git a/res/css/views/elements/_RichText.scss b/res/css/views/elements/_RichText.scss
index 221fc54a055..4615f5da23f 100644
--- a/res/css/views/elements/_RichText.scss
+++ b/res/css/views/elements/_RichText.scss
@@ -76,7 +76,9 @@ a.mx_Pill {
 }
 
 .mx_Emoji {
-    font-size: 1.8rem;
+    // Should be 1.8rem for our default 1.4rem message bodies,
+    // and scale with the size of the surrounding text
+    font-size: calc(18 / 14 * 1em);
     vertical-align: bottom;
 }