diff --git a/app/assets/javascripts/discourse/controllers/discovery.js.es6 b/app/assets/javascripts/discourse/controllers/discovery.js.es6
index 8f012b42fac..68ac68f45fb 100644
--- a/app/assets/javascripts/discourse/controllers/discovery.js.es6
+++ b/app/assets/javascripts/discourse/controllers/discovery.js.es6
@@ -4,8 +4,6 @@ import TopPeriod from 'discourse/models/top-period';
 export default ObjectController.extend({
   needs: ['navigation/category', 'discovery/topics'],
   loading: false,
-  loadingSpinner: false,
-  scheduledSpinner: null,
 
   category: Em.computed.alias('controllers.navigation/category.category'),
   noSubcategories: Em.computed.alias('controllers.navigation/category.noSubcategories'),
diff --git a/app/assets/javascripts/discourse/routes/discovery_route.js b/app/assets/javascripts/discourse/routes/discovery_route.js
index 27f6d49c0a5..2c0f5d993f1 100644
--- a/app/assets/javascripts/discourse/routes/discovery_route.js
+++ b/app/assets/javascripts/discourse/routes/discovery_route.js
@@ -26,15 +26,11 @@ Discourse.DiscoveryRoute = Discourse.Route.extend(Discourse.ScrollTop, Discourse
       if (controller.get('loading')) { return; }
 
       controller.set('loading', true);
-      controller.set('scheduledSpinner', Ember.run.later(controller, function() {
-        this.set('loadingSpinner', true);
-      },500));
     },
 
     loadingComplete: function() {
       var controller = this.controllerFor('discovery');
-      Ember.run.cancel(controller.get('scheduledSpinner'));
-      controller.setProperties({ loading: false, loadingSpinner: false });
+      controller.set('loading', false);
       if (!Discourse.Session.currentProp('topicListScrollPosition')) {
         this._scrollTop();
       }
diff --git a/app/assets/javascripts/discourse/templates/discovery.hbs b/app/assets/javascripts/discourse/templates/discovery.hbs
index 4a7fdb68ae0..32daec93867 100644
--- a/app/assets/javascripts/discourse/templates/discovery.hbs
+++ b/app/assets/javascripts/discourse/templates/discovery.hbs
@@ -10,26 +10,26 @@
   </div>
 </div>
 
-{{#if loadingSpinner}}
+{{#if loading}}
   {{loading-spinner}}
-{{else}}
-  <div {{bind-attr class=":container :list-container loadingSpinner:hidden"}}>
-    <div class="row">
-      <div class="full-width">
-        <div id='header-list-area'>
-          {{outlet header-list-container}}
-        </div>
-      </div>
-    </div>
-    <div class="row">
-      <div class="full-width">
-        <div id='list-area'>
-          {{outlet list-container}}
-        </div>
+{{/if}}
+
+<div {{bind-attr class=":container :list-container loading:hidden"}}>
+  <div class="row">
+    <div class="full-width">
+      <div id='header-list-area'>
+        {{outlet header-list-container}}
       </div>
     </div>
   </div>
-  {{#if loadedAllItems}}
-    {{custom-html "footer"}}
-  {{/if}}
+  <div class="row">
+    <div class="full-width">
+      <div id='list-area'>
+        {{outlet list-container}}
+      </div>
+    </div>
+  </div>
+</div>
+{{#if loadedAllItems}}
+  {{custom-html "footer"}}
 {{/if}}