diff --git a/app/assets/javascripts/discourse/controllers/user_controller.js b/app/assets/javascripts/discourse/controllers/user_controller.js
index 1054198763b..bc7fb0f3207 100644
--- a/app/assets/javascripts/discourse/controllers/user_controller.js
+++ b/app/assets/javascripts/discourse/controllers/user_controller.js
@@ -19,8 +19,8 @@ Discourse.UserController = Discourse.ObjectController.extend({
   }.property('viewingSelf'),
 
   showBadges: function() {
-    return Discourse.SiteSettings.enable_badges;
-  }.property(),
+    return Discourse.SiteSettings.enable_badges && (this.get('content.badge_count') > 0);
+  }.property('content.badge_count'),
 
   privateMessageView: function() {
     return (this.get('userActionType') === Discourse.UserAction.TYPES.messages_sent) ||