diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs
index 1673cb3c1b6..0c3201057ac 100644
--- a/app/assets/javascripts/discourse/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/templates/topic.hbs
@@ -53,11 +53,15 @@
             <h1 data-topic-id="{{unbound model.id}}">
               {{#unless model.is_warning}}
                 {{#if siteSettings.enable_personal_messages}}
-                  <a href={{pmPath}}>
-                    <span class="private-message-glyph">{{d-icon "envelope"}}</span>
-                  </a>
+                  {{#if model.isPrivateMessage}}
+                    <a href={{pmPath}}>
+                      <span class="private-message-glyph">{{d-icon "envelope"}}</span>
+                    </a>
+                  {{/if}}
                 {{else}}
-                  <span class="private-message-glyph">{{d-icon "envelope"}}</span>
+                  {{#if model.isPrivateMessage}}
+                    <span class="private-message-glyph">{{d-icon "envelope"}}</span>
+                  {{/if}}
                 {{/if}}
               {{/unless}}