diff --git a/app/assets/javascripts/discourse/app/models/topic-tracking-state.js b/app/assets/javascripts/discourse/app/models/topic-tracking-state.js
index 65d1c21269f..ee18ed42874 100644
--- a/app/assets/javascripts/discourse/app/models/topic-tracking-state.js
+++ b/app/assets/javascripts/discourse/app/models/topic-tracking-state.js
@@ -354,6 +354,10 @@ const TopicTrackingState = EmberObject.extend({
         row.category_id = topic.category.id;
       }
 
+      if (topic.tags) {
+        row.tags = topic.tags;
+      }
+
       tracker.states["t" + topic.id] = row;
     });