diff --git a/app/assets/javascripts/discourse/components/conditional-loading-spinner.js.es6 b/app/assets/javascripts/discourse/components/conditional-loading-spinner.js.es6
index ca6d0386ae..d768076284 100644
--- a/app/assets/javascripts/discourse/components/conditional-loading-spinner.js.es6
+++ b/app/assets/javascripts/discourse/components/conditional-loading-spinner.js.es6
@@ -1,8 +1,18 @@
-export default Ember.Component.extend({
+import StringBuffer from 'discourse/mixins/string-buffer';
+
+export default Ember.Component.extend(StringBuffer, {
   classNameBindings: ['containerClass'],
-  layoutName: 'components/conditional-loading-spinner',
+  rerenderTriggers: ['condition'],
 
   containerClass: function() {
     return (this.get('size') === 'small') ? 'inline-spinner' : undefined;
-  }.property('size')
+  }.property('size'),
+
+  renderString: function(buffer) {
+    if (this.get('condition')) {
+      buffer.push('<div class="spinner ' + this.get('size') + '"}}></div>');
+    } else {
+      return this._super();
+    }
+  }
 });
diff --git a/app/assets/javascripts/discourse/templates/components/conditional-loading-spinner.hbs b/app/assets/javascripts/discourse/templates/components/conditional-loading-spinner.hbs
deleted file mode 100644
index d1d27ae58e..0000000000
--- a/app/assets/javascripts/discourse/templates/components/conditional-loading-spinner.hbs
+++ /dev/null
@@ -1,5 +0,0 @@
-{{#if condition}}
-  <div {{bind-attr class=":spinner size"}}></div>
-{{else}}
-  {{yield}}
-{{/if}}