diff --git a/assets/javascripts/discourse/components/assigned-topic-list-item.js.es6 b/assets/javascripts/discourse/components/assigned-topic-list-item.js.es6
index 9ebe092..5f1c53f 100644
--- a/assets/javascripts/discourse/components/assigned-topic-list-item.js.es6
+++ b/assets/javascripts/discourse/components/assigned-topic-list-item.js.es6
@@ -1,5 +1,21 @@
-import { ListItemDefaults } from "discourse/components/topic-list-item";
+import {
+  ListItemDefaults,
+  default as TopicListItem
+} from "discourse/components/topic-list-item";
 
-export default Ember.Component.extend(ListItemDefaults, {
-  isPrivateMessage: Ember.computed.equal("topic.archetype", "private_message")
-});
+// This is a backward compatible fix so that this change:
+// https://github.com/discourse/discourse/pull/8589
+// in discourse core doesn't break this plugin.
+let assignedTopicListItem = null;
+
+if (ListItemDefaults) {
+  assignedTopicListItem = Ember.Component.extend(ListItemDefaults, {
+    isPrivateMessage: Ember.computed.equal("topic.archetype", "private_message")
+  });
+} else {
+  assignedTopicListItem = TopicListItem.extend({
+    isPrivateMessage: Ember.computed.equal("topic.archetype", "private_message")
+  });
+}
+
+export default assignedTopicListItem;