diff --git a/app/assets/javascripts/discourse/controllers/user-topics-list.js.es6 b/app/assets/javascripts/discourse/controllers/user-topics-list.js.es6 index 956557c14ea..9f877a1bb38 100644 --- a/app/assets/javascripts/discourse/controllers/user-topics-list.js.es6 +++ b/app/assets/javascripts/discourse/controllers/user-topics-list.js.es6 @@ -31,7 +31,8 @@ export default Ember.Controller.extend({ }, unsubscribe() { - this.messageBus.unsubscribe(this.get('channel')); + const channel = this.get('channel'); + if (channel) this.messageBus.unsubscribe(channel); this._resetTracking(); this.set('channel', null); },