diff --git a/app/assets/javascripts/discourse/routes/badges_show_route.js b/app/assets/javascripts/discourse/routes/badges_show_route.js
index d0769325040..88e022cb187 100644
--- a/app/assets/javascripts/discourse/routes/badges_show_route.js
+++ b/app/assets/javascripts/discourse/routes/badges_show_route.js
@@ -18,6 +18,7 @@ Discourse.BadgesShowRoute = Ember.Route.extend({
   setupController: function(controller, model) {
     Discourse.UserBadge.findByBadgeId(model.get('id')).then(function(userBadges) {
       controller.set('userBadges', userBadges);
+      controller.set('userBadgesLoaded', true);
     });
     controller.set('model', model);
   }
diff --git a/app/assets/javascripts/discourse/templates/badges/show.js.handlebars b/app/assets/javascripts/discourse/templates/badges/show.js.handlebars
index 7f0b70167f8..22681594ed4 100644
--- a/app/assets/javascripts/discourse/templates/badges/show.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/badges/show.js.handlebars
@@ -22,6 +22,8 @@
       {{/link-to}}
     {{/each}}
   {{else}}
-    <div class='spinner'>{{i18n loading}}</div>
+    {{#unless userBadgesLoaded}}
+      <div class='spinner'>{{i18n loading}}</div>
+    {{/unless}}
   {{/if}}
 </div>