diff --git a/app/assets/javascripts/discourse/components/reviewable-item.js.es6 b/app/assets/javascripts/discourse/components/reviewable-item.js.es6
index 786f7d5440a..f998452e333 100644
--- a/app/assets/javascripts/discourse/components/reviewable-item.js.es6
+++ b/app/assets/javascripts/discourse/components/reviewable-item.js.es6
@@ -22,8 +22,9 @@ export default Component.extend({
     return type.dasherize();
   },
 
-  @discourseComputed("reviewable.topic_id", "reviewable.removed_topic_id")
-  topicId(topicId, removedTopicId) {
+  @discourseComputed("reviewable.topic", "reviewable.removed_topic_id")
+  topicId(topic, removedTopicId) {
+    let topicId = topic ? topic.id : null;
     return topicId || removedTopicId;
   },