diff --git a/app/models/category_featured_topic.rb b/app/models/category_featured_topic.rb
index 1cba8e1d902..728fbd96720 100644
--- a/app/models/category_featured_topic.rb
+++ b/app/models/category_featured_topic.rb
@@ -23,7 +23,7 @@ class CategoryFeaturedTopic < ActiveRecord::Base
       admin.admin = true
       admin.id = -1
 
-      query = TopicQuery.new(admin, per_page: SiteSetting.category_featured_topics, except_topic_id: c.topic_id)
+      query = TopicQuery.new(admin, per_page: SiteSetting.category_featured_topics, except_topic_id: c.topic_id, visible: true)
       results = query.list_category(c)
       if results.present?
         results.topic_ids.each_with_index do |topic_id, idx|
diff --git a/lib/topic_query.rb b/lib/topic_query.rb
index 7696a21e5a1..3b5c98c844a 100644
--- a/lib/topic_query.rb
+++ b/lib/topic_query.rb
@@ -257,7 +257,7 @@ class TopicQuery
       result = result.where('categories.name is null or categories.name <> ?', query_opts[:exclude_category]) if query_opts[:exclude_category]
       result = result.where('categories.name = ?', query_opts[:only_category]) if query_opts[:only_category]
       result = result.limit(page_size) unless query_opts[:limit] == false
-      result = result.visible if @user.blank? or @user.regular?
+      result = result.visible if @opts[:visible] or @user.blank? or @user.regular?
       result = result.where('topics.id <> ?', query_opts[:except_topic_id]) if query_opts[:except_topic_id].present?
       result = result.offset(query_opts[:page].to_i * page_size) if query_opts[:page].present?
 
diff --git a/spec/models/category_featured_topic_spec.rb b/spec/models/category_featured_topic_spec.rb
index 6baa36e97d1..e4d7d1045c2 100644
--- a/spec/models/category_featured_topic_spec.rb
+++ b/spec/models/category_featured_topic_spec.rb
@@ -5,23 +5,33 @@ describe CategoryFeaturedTopic do
   it { should belong_to :category }
   it { should belong_to :topic }
 
-  it "should feature topics for a secure category" do
+  context 'feature_topics_for' do
+    let(:user)           { Fabricate(:user) }
+    let(:category)       { Fabricate(:category) }
+    let!(:category_post) { PostCreator.create(user, raw: "I put this post in the category", title: "categorize THIS", category: category.name) }
 
-    # so much dancing, I am thinking fixures make sense here.
-    user = Fabricate(:user)
-    user.change_trust_level!(:basic)
+    it "should feature topics for a secure category" do
 
-    category = Fabricate(:category)
-    category.deny(:all)
-    category.allow(Group[:trust_level_1])
-    category.save
+      # so much dancing, I am thinking fixures make sense here.
+      user.change_trust_level!(:basic)
 
-    uncategorized_post = PostCreator.create(user, raw: "this is my new post 123 post", title: "hello world")
-    category_post = PostCreator.create(user, raw: "I put this post in the category", title: "categorize THIS", category: category.name)
+      category.deny(:all)
+      category.allow(Group[:trust_level_1])
+      category.save
 
-    CategoryFeaturedTopic.feature_topics_for(category)
-    CategoryFeaturedTopic.count.should == 1
+      uncategorized_post = PostCreator.create(user, raw: "this is my new post 123 post", title: "hello world")
 
+      CategoryFeaturedTopic.feature_topics_for(category)
+      CategoryFeaturedTopic.count.should == 1
+
+    end
+
+    it 'should not include invisible topics' do
+      invisible_post = PostCreator.create(user, raw: "Don't look at this post because it's awful.", title: "not visible to anyone", category: category.name)
+      invisible_post.topic.update_status('visible', false, Fabricate(:admin))
+      CategoryFeaturedTopic.feature_topics_for(category)
+      CategoryFeaturedTopic.count.should == 1
+    end
   end
 
 end