diff --git a/app/assets/javascripts/discourse/app/templates/components/emoji-picker.hbs b/app/assets/javascripts/discourse/app/templates/components/emoji-picker.hbs
index 7dd6db19eb1..68b2c0865cf 100644
--- a/app/assets/javascripts/discourse/app/templates/components/emoji-picker.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/emoji-picker.hbs
@@ -7,7 +7,7 @@
         </button>
       {{/if}}
 
-      {{emoji-group-buttons onCategorySelection=(action "onCategorySelection")}}
+      {{emoji-group-buttons onCategorySelection=(action "onCategorySelection") tagName=""}}
 
       {{#each-in customEmojis as |group emojis|}}
         <button type="button" data-section={{concat "custom-" group}} {{action "onCategorySelection" (concat "custom-" group)}} class="btn btn-default category-button emoji">
diff --git a/app/assets/stylesheets/common/base/emoji.scss b/app/assets/stylesheets/common/base/emoji.scss
index 89966b36c71..a617982c929 100644
--- a/app/assets/stylesheets/common/base/emoji.scss
+++ b/app/assets/stylesheets/common/base/emoji.scss
@@ -106,7 +106,6 @@ sup img.emoji {
     width: 50px;
     padding-left: 0.5em;
     display: flex;
-    justify-content: center;
     flex-wrap: wrap;
     border-right: 1px solid var(--primary-low);