diff --git a/app/assets/javascripts/discourse/controllers/header.js.es6 b/app/assets/javascripts/discourse/controllers/header.js.es6
index 8e2679eedbb..2b64251f8bf 100644
--- a/app/assets/javascripts/discourse/controllers/header.js.es6
+++ b/app/assets/javascripts/discourse/controllers/header.js.es6
@@ -12,7 +12,9 @@ export default DiscourseController.extend({
 
   hasCategory: function() {
     var cat = this.get('topic.category');
-    return cat && !cat.get('isUncategorizedCategory');
+    return cat &&
+           !cat.get('isUncategorizedCategory') ||
+           !this.siteSettings.suppress_uncategorized_badge;
   }.property('topic.category'),
 
   showPrivateMessageGlyph: function() {