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 4fb64ede697..cf41fb095eb 100644
--- a/app/assets/javascripts/discourse/templates/components/topic-map.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/components/topic-map.js.handlebars
@@ -32,14 +32,18 @@
{{i18n participants}}
{{number topic.participant_count}}
-
- {{i18n likes}}
- {{number topic.like_count}}
-
+ {{#if topic.like_count}}
+
+ {{i18n likes}}
+ {{number topic.like_count}}
+
+ {{/if}}
+ {{#if details.links.length}}
{{i18n links}}
{{number details.links.length}}
+ {{/if}}
{{#groupedEach participant in details.fewParticipants}}{{topic-participant participant=participant}}{{/groupedEach}}