diff --git a/src/discussions/topics/data/thunks.js b/src/discussions/topics/data/thunks.js
index 06426d6a..1ef6a137 100644
--- a/src/discussions/topics/data/thunks.js
+++ b/src/discussions/topics/data/thunks.js
@@ -11,13 +11,13 @@ function normaliseTopics(data) {
   const categoryIds = [];
   data.coursewareTopics.forEach(category => {
     topicsInCategory[category.name] = category.children.map(topic => {
-      topics[topic.id] = { id: topic.id, name: topic.name, categoryId: category.name };
+      topics[topic.id] = { ...topic, categoryId: category.name };
       return topic.id;
     });
     categoryIds.push(category.name);
   });
   const nonCoursewareIds = data.nonCoursewareTopics.map(topic => {
-    topics[topic.id] = { id: topic.id, name: topic.name };
+    topics[topic.id] = topic;
     return topic.id;
   });
   return {
diff --git a/src/discussions/topics/topic-group/topic/Topic.jsx b/src/discussions/topics/topic-group/topic/Topic.jsx
index 64619eed..4b3648f8 100644
--- a/src/discussions/topics/topic-group/topic/Topic.jsx
+++ b/src/discussions/topics/topic-group/topic/Topic.jsx
@@ -21,12 +21,12 @@ function Topic({ topic }) {
     {
       key: 'discussions',
       icon: PostIcon,
-      count: topic?.threadCounts?.discussions || 0,
+      count: topic.threadCounts?.discussion || 0,
     },
     {
       key: 'questions',
       icon: Help,
-      count: topic?.threadCounts?.questions || 0,
+      count: topic.threadCounts?.question || 0,
     },
   ];
   return (