diff --git a/app/assets/javascripts/discourse/routes/build-topic-route.js.es6 b/app/assets/javascripts/discourse/routes/build-topic-route.js.es6
index 457399f2eb..10a67214d9 100644
--- a/app/assets/javascripts/discourse/routes/build-topic-route.js.es6
+++ b/app/assets/javascripts/discourse/routes/build-topic-route.js.es6
@@ -67,7 +67,7 @@ function findTopicList(store, tracking, filter, filterParams, extras) {
     }
     Session.currentProp("topicList", list);
     if (list.topic_list && list.topic_list.top_tags) {
-      if (list.filter.startsWith("c/")) {
+      if (list.filter.startsWith("c/") || list.filter.startsWith("tags/c/")) {
         Site.currentProp("category_top_tags", list.topic_list.top_tags);
       } else {
         Site.currentProp("top_tags", list.topic_list.top_tags);