diff --git a/app/assets/javascripts/discourse/views/topic.js.es6 b/app/assets/javascripts/discourse/views/topic.js.es6
index 772291a51..758a8a06e 100644
--- a/app/assets/javascripts/discourse/views/topic.js.es6
+++ b/app/assets/javascripts/discourse/views/topic.js.es6
@@ -126,7 +126,7 @@ var TopicView = Discourse.View.extend(AddCategoryClass, Discourse.Scrolling, {
     var opts = { latestLink: "<a href=\"" + Discourse.getURL("/latest") + "\">" + I18n.t("topic.view_latest_topics") + "</a>" },
         category = this.get('controller.content.category');
 
-    if(Em.get(category, 'id') === Discourse.Site.currentProp("uncategorized_category_id")) {
+    if(category && Em.get(category, 'id') === Discourse.Site.currentProp("uncategorized_category_id")) {
       category = null;
     }
 
diff --git a/app/models/site.rb b/app/models/site.rb
index bfe31fb6e..4d3c15905 100644
--- a/app/models/site.rb
+++ b/app/models/site.rb
@@ -43,7 +43,12 @@ class Site
         .secured(@guardian)
         .includes(:topic_only_relative_url)
         .order(:position)
-        .to_a
+
+      unless SiteSetting.allow_uncategorized_topics
+        categories = categories.where('categories.id <> ?', SiteSetting.uncategorized_category_id)
+      end
+
+      categories = categories.to_a
 
       allowed_topic_create = Set.new(Category.topic_create_allowed(@guardian).pluck(:id))