diff --git a/app/assets/javascripts/discourse/components/composer-messages.js.es6 b/app/assets/javascripts/discourse/components/composer-messages.js.es6
index 59b3586dd32..4fd967ade22 100644
--- a/app/assets/javascripts/discourse/components/composer-messages.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-messages.js.es6
@@ -170,6 +170,7 @@ export default Ember.Component.extend({
 
     const queuedForTyping = this.get('queuedForTyping');
     composer.store.find('composer-message', args).then(messages => {
+      if (this.isDestroying || this.isDestroyed) { return; }
 
       // Checking composer messages on replies can give us a list of links to check for
       // duplicates