diff --git a/app/assets/javascripts/discourse/components/topic-map.js.es6 b/app/assets/javascripts/discourse/components/topic-map.js.es6
index 9096c05c5e0..eed1e182388 100644
--- a/app/assets/javascripts/discourse/components/topic-map.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-map.js.es6
@@ -22,6 +22,8 @@ export default Ember.Component.extend({
     this.set('mapCollapsed', Discourse.Mobile.mobileView || (!this.get('topic.has_summary')));
   },
 
+  showPosterAvatar: Em.computed.gt('topic.posts_count', 2),
+
   toggleMapClass: function() {
     return this.get('mapCollapsed') ? 'fa fa-chevron-down' : 'fa fa-chevron-up';
   }.property('mapCollapsed'),
diff --git a/app/assets/javascripts/discourse/templates/components/topic-map.js.handlebars b/app/assets/javascripts/discourse/templates/components/topic-map.js.handlebars
index cb2b93f187f..aa0e30f3f5a 100644
--- a/app/assets/javascripts/discourse/templates/components/topic-map.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/components/topic-map.js.handlebars
@@ -39,14 +39,16 @@
       </li>
     {{/if}}
     {{#if details.links.length}}
-    <li class='secondary'>
-      {{number details.links.length}}
-      <h4>{{i18n links_lowercase}}</h4>
-    </li>
+      <li class='secondary'>
+        {{number details.links.length}}
+        <h4>{{i18n links_lowercase}}</h4>
+      </li>
+    {{/if}}
+    {{#if showPosterAvatar}}
+      <li {{bind-attr class=":avatars mapCollapsed::hidden"}}>
+        {{#grouped-each participant in details.fewParticipants}}{{topic-participant participant=participant}}{{/grouped-each}}
+      </li>
     {{/if}}
-    <li {{bind-attr class=":avatars mapCollapsed::hidden"}}>
-      {{#grouped-each participant in details.fewParticipants}}{{topic-participant participant=participant}}{{/grouped-each}}
-    </li>
   </ul>
 </section>