diff --git a/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6 b/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6
index be8427c4ddb..5361279452c 100644
--- a/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6
+++ b/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6
@@ -72,6 +72,10 @@ export default Ember.Component.extend({
 
     this.set('oldPresenceState', this.get('presenceState'));
     this.set('presenceState', stateObject);
+
+    if (isClosing) {
+      Ember.run.cancel(this._timeoutTimer);
+    }
   },
 
   _ACTIONS: ['edit', 'reply'],