diff --git a/app/assets/javascripts/discourse/app/templates/components/d-button.hbs b/app/assets/javascripts/discourse/app/templates/components/d-button.hbs
index e6586be8dd6..a05a03a3903 100644
--- a/app/assets/javascripts/discourse/app/templates/components/d-button.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/d-button.hbs
@@ -8,7 +8,7 @@
 
 {{~#if this.computedLabel~}}
   <span class="d-button-label">{{html-safe this.computedLabel}}{{#if this.ellipsis}}&hellip;{{/if}}</span>
-{{~else~}}
+{{~else if (not (has-block))~}}
   &#8203;
   {{! Zero-width space character, so icon-only button height = regular button height }}
 {{~/if~}}