diff --git a/app/assets/stylesheets/common/base/emoji.scss b/app/assets/stylesheets/common/base/emoji.scss
index 0f04d5e09de..70f86f07c7e 100644
--- a/app/assets/stylesheets/common/base/emoji.scss
+++ b/app/assets/stylesheets/common/base/emoji.scss
@@ -1,7 +1,16 @@
 img.emoji {
   width: 20px;
   height: 20px;
-  vertical-align: middle;
+  vertical-align: text-bottom;
+
+  h1 &,
+  h2 &,
+  h3 &,
+  h4 &,
+  h5 &,
+  h6 & {
+    vertical-align: middle;
+  }
 }
 
 img.emoji.only-emoji {