diff --git a/app/logical/post_sets/post.rb b/app/logical/post_sets/post.rb
index 16d4b5927..204055e6d 100644
--- a/app/logical/post_sets/post.rb
+++ b/app/logical/post_sets/post.rb
@@ -48,10 +48,14 @@ module PostSets
           timeout = 300
         end
         
-        temp = ::Post.with_timeout(timeout, Danbooru.config.blank_tag_search_fast_count || 1_000_000) do
+        temp = ::Post.with_timeout(timeout, nil) do
           ::Post.tag_match(tag_string).paginate(page, :count => ::Post.fast_count(tag_string), :limit => per_page)
         end
         
+        if temp.nil?
+          temp = ::Post.where("FALSE").paginate(page)
+        end
+        
         temp.all
         temp
       end