diff --git a/app/controllers/post_versions_controller.rb b/app/controllers/post_versions_controller.rb
index be4e74bc3..942bf3daf 100644
--- a/app/controllers/post_versions_controller.rb
+++ b/app/controllers/post_versions_controller.rb
@@ -2,7 +2,7 @@ class PostVersionsController < ApplicationController
   respond_to :html, :xml, :json
 
   def index
-    @post_versions = PostVersion.search(params[:search]).order("updated_at desc").paginate(params[:page], :count => 1_000_000)
+    @post_versions = PostVersion.search(params[:search]).order("updated_at desc").paginate(params[:page], :count => (params[:search].present? ? nil : 1_000_000))
     respond_with(@post_versions)
   end