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