diff --git a/app/assets/javascripts/discourse/controllers/site_map_controller.js b/app/assets/javascripts/discourse/controllers/site_map_controller.js
index f8ca13fc068..01032113862 100644
--- a/app/assets/javascripts/discourse/controllers/site_map_controller.js
+++ b/app/assets/javascripts/discourse/controllers/site_map_controller.js
@@ -22,7 +22,14 @@ Discourse.SiteMapController = Ember.ArrayController.extend(Discourse.HasCurrentU
   }.property(),
 
   categories: function() {
-    return Discourse.Category.list();
+    if (Discourse.SiteSettings.allow_uncategorized_topics) {
+      return Discourse.Category.list();
+    } else {
+      // Exclude the uncategorized category if it's empty
+      return Discourse.Category.list().reject(function(c) {
+        return c.get('isUncategorizedCategory') && !Discourse.User.currentProp('staff');
+      });
+    }
   }.property(),
 
   actions: {