diff --git a/app/assets/javascripts/discourse/helpers/category-link.js.es6 b/app/assets/javascripts/discourse/helpers/category-link.js.es6
index b32c0c94522..a9867dac2a4 100644
--- a/app/assets/javascripts/discourse/helpers/category-link.js.es6
+++ b/app/assets/javascripts/discourse/helpers/category-link.js.es6
@@ -75,6 +75,9 @@ export function categoryLinkHTML(category, options) {
     if (options.categoryStyle) {
       categoryOptions.categoryStyle = options.categoryStyle;
     }
+    if (options.recursive) {
+      categoryOptions.recursive = true;
+    }
   }
   return new Handlebars.SafeString(
     categoryBadgeHTML(category, categoryOptions)
diff --git a/app/assets/javascripts/discourse/templates/components/topic-category.hbs b/app/assets/javascripts/discourse/templates/components/topic-category.hbs
index 4b2db9cb1d8..35cea871907 100644
--- a/app/assets/javascripts/discourse/templates/components/topic-category.hbs
+++ b/app/assets/javascripts/discourse/templates/components/topic-category.hbs
@@ -1,8 +1,5 @@
 {{#unless topic.isPrivateMessage}}
-  {{#if topic.category.parentCategory}}
-    {{bound-category-link topic.category.parentCategory}}
-  {{/if}}
-  {{bound-category-link topic.category hideParent=true}}
+  {{bound-category-link topic.category recursive=true hideParent=true}}
 {{/unless}}
 <div class="topic-header-extra">
   {{#if siteSettings.tagging_enabled}}