diff --git a/assets/javascripts/discourse-assign/initializers/extend-for-assigns.js.es6 b/assets/javascripts/discourse-assign/initializers/extend-for-assigns.js.es6
index adf540e..bb70abb 100644
--- a/assets/javascripts/discourse-assign/initializers/extend-for-assigns.js.es6
+++ b/assets/javascripts/discourse-assign/initializers/extend-for-assigns.js.es6
@@ -200,9 +200,12 @@ function initialize(api) {
         this.appEvents.trigger("header:update-topic", topic);
       });
     },
+
     unsubscribe() {
-      this._super();
-      if (!this.get("content.id")) return;
+      this._super(...arguments);
+
+      if (!this.get("model.id")) return;
+
       this.messageBus.unsubscribe("/staff/topic-assignment");
     }
   });