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 44184dd2c8e..4c2437e99b5 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
@@ -18,4 +18,4 @@ export default Ember.Component.extend({
     return length > 0;
   }
 
-});
\ No newline at end of file
+});
diff --git a/plugins/discourse-presence/assets/javascripts/discourse/templates/connectors/composer-fields/presence.hbs b/plugins/discourse-presence/assets/javascripts/discourse/templates/connectors/composer-fields/presence.hbs
index 0f3c2e1b95b..127cb33575e 100644
--- a/plugins/discourse-presence/assets/javascripts/discourse/templates/connectors/composer-fields/presence.hbs
+++ b/plugins/discourse-presence/assets/javascripts/discourse/templates/connectors/composer-fields/presence.hbs
@@ -1,3 +1 @@
-{{#if siteSettings.presence_enabled}}
-  {{composer-presence-display}}
-{{/if}}
+{{composer-presence-display}}
diff --git a/plugins/discourse-presence/assets/javascripts/discourse/templates/connectors/composer-fields/presence.js.es6 b/plugins/discourse-presence/assets/javascripts/discourse/templates/connectors/composer-fields/presence.js.es6
new file mode 100644
index 00000000000..00fbc34d912
--- /dev/null
+++ b/plugins/discourse-presence/assets/javascripts/discourse/templates/connectors/composer-fields/presence.js.es6
@@ -0,0 +1,5 @@
+export default {
+  shouldRender(_, ctx) {
+    return ctx.siteSettings.presence_enabled;
+  }
+};