diff --git a/app/models/post.rb b/app/models/post.rb
index f321db811..62b8e2217 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -602,7 +602,7 @@ class Post < ActiveRecord::Base
         count = get_count_from_cache(tags)
       
         if count.nil?
-          fast_count_search(tags)
+          count = fast_count_search(tags)
         end
       end
 
@@ -623,6 +623,8 @@ class Post < ActiveRecord::Base
       if count > Danbooru.config.posts_per_page * 10
         set_count_in_cache(tags, count)
       end
+      
+      count
     end
   end
   
diff --git a/lib/danbooru/paginator/active_record_extension.rb b/lib/danbooru/paginator/active_record_extension.rb
index 07cba7869..c00f59f5e 100644
--- a/lib/danbooru/paginator/active_record_extension.rb
+++ b/lib/danbooru/paginator/active_record_extension.rb
@@ -70,7 +70,6 @@ module Danbooru
 
         # taken from kaminari (https://github.com/amatsuda/kaminari)
         def total_count
-          raise if @paginator_options[:count] == 0
           return @paginator_options[:count] if @paginator_options[:count]
           
           c = except(:offset, :limit, :order)