diff --git a/app/controllers/admin/admin_users_controller.rb b/app/controllers/admin/admin_users_controller.rb
index f2e11674d..39a177342 100644
--- a/app/controllers/admin/admin_users_controller.rb
+++ b/app/controllers/admin/admin_users_controller.rb
@@ -7,7 +7,7 @@ module Admin
       @q = AdminUser.search(params[:q])
       @admin_users = @q.result.page(params[:page]).order(:username)
       @count = @q.result.count
-      @admin_users = @admin_users.per(params[:results_per_page]) if params[:results_per_page].to_i.positive?
+      @admin_users = @admin_users.per(params[:results_per_page]) if paginate?
     end
 
     def new
diff --git a/app/controllers/admin/api_users_controller.rb b/app/controllers/admin/api_users_controller.rb
index 3ca70d543..534dc4491 100644
--- a/app/controllers/admin/api_users_controller.rb
+++ b/app/controllers/admin/api_users_controller.rb
@@ -5,7 +5,7 @@ module Admin
     def index
       @q = ApiUser.includes(:registrar).search(params[:q])
       @api_users = @q.result.page(params[:page])
-      api_users_paginate if params[:results_per_page].to_i.positive?
+      @api_users = @api_users.per(params[:results_per_page]) if paginate?
     end
 
     def new
@@ -57,9 +57,5 @@ module Admin
     def registrar
       Registrar.find(params[:registrar_id])
     end
-
-    def api_users_paginate
-      @api_users = @api_users.per(params[:results_per_page])
-    end
   end
 end
diff --git a/app/controllers/admin/bank_statements_controller.rb b/app/controllers/admin/bank_statements_controller.rb
index ced157e4d..227af994b 100644
--- a/app/controllers/admin/bank_statements_controller.rb
+++ b/app/controllers/admin/bank_statements_controller.rb
@@ -8,8 +8,7 @@ module Admin
       @q = BankStatement.search(params[:q])
       @q.sorts = 'id desc' if @q.sorts.empty?
       @bank_statements = @q.result.page(params[:page])
-      @count = @q.result.count
-      @bank_statements = @bank_statements.per(params[:results_per_page]) if params[:results_per_page].to_i.positive?
+      @bank_statements = @bank_statements.per(params[:results_per_page]) if paginate?
     end
 
     def show
diff --git a/app/controllers/admin/base_controller.rb b/app/controllers/admin/base_controller.rb
index 1fec2a18f..b5e91f2ab 100644
--- a/app/controllers/admin/base_controller.rb
+++ b/app/controllers/admin/base_controller.rb
@@ -17,5 +17,9 @@ module Admin
     def user_for_paper_trail
       current_admin_user ? current_admin_user.id_role_username : 'anonymous'
     end
+
+    def paginate?
+      params[:results_per_page].to_i.positive?
+    end
   end
 end
diff --git a/app/controllers/admin/epp_logs_controller.rb b/app/controllers/admin/epp_logs_controller.rb
index 2d72c068c..1a7602b90 100644
--- a/app/controllers/admin/epp_logs_controller.rb
+++ b/app/controllers/admin/epp_logs_controller.rb
@@ -12,7 +12,7 @@ module Admin
       @epp_logs = @epp_logs.where("extract(epoch from created_at) <= extract(epoch from ?::timestamp)", Time.parse(params[:q][:created_at_lteq])) if params[:q][:created_at_lteq].present?
       @epp_logs = @epp_logs.page(params[:page])
       @count = @q.result.count
-      @epp_logs = @epp_logs.per(params[:results_per_page]) if params[:results_per_page].to_i.positive?
+      @epp_logs = @epp_logs.per(params[:results_per_page]) if paginate?
     end
 
     def show
diff --git a/app/controllers/admin/invoices_controller.rb b/app/controllers/admin/invoices_controller.rb
index 3129b0d8e..35b650c84 100644
--- a/app/controllers/admin/invoices_controller.rb
+++ b/app/controllers/admin/invoices_controller.rb
@@ -36,8 +36,7 @@ module Admin
       @q = Invoice.includes(:account_activity).search(params[:q])
       @q.sorts = 'number desc' if @q.sorts.empty?
       @invoices = @q.result.page(params[:page])
-      @count = @q.result.count
-      @invoices = @invoices.per(params[:results_per_page]) if params[:results_per_page].to_i.positive?
+      @invoices = @invoices.per(params[:results_per_page]) if paginate?
     end
 
     def show; end
diff --git a/app/controllers/admin/registrars_controller.rb b/app/controllers/admin/registrars_controller.rb
index 534d2f248..36a8f76dc 100644
--- a/app/controllers/admin/registrars_controller.rb
+++ b/app/controllers/admin/registrars_controller.rb
@@ -8,8 +8,7 @@ module Admin
     def index
       @q = Registrar.joins(:accounts).ordered.search(params[:q])
       @registrars = @q.result.page(params[:page])
-      @count = @q.result.count
-      @registrars = @registrars.per(params[:results_per_page]) if params[:results_per_page].to_i.positive?
+      @registrars = @registrars.per(params[:results_per_page]) if paginate?
     end
 
     def new
diff --git a/app/controllers/admin/repp_logs_controller.rb b/app/controllers/admin/repp_logs_controller.rb
index e4e3c3481..0bbd15dbe 100644
--- a/app/controllers/admin/repp_logs_controller.rb
+++ b/app/controllers/admin/repp_logs_controller.rb
@@ -12,7 +12,7 @@ module Admin
       @repp_logs = @repp_logs.where("extract(epoch from created_at) <= extract(epoch from ?::timestamp)", Time.parse(params[:q][:created_at_lteq])) if params[:q][:created_at_lteq].present?
       @repp_logs = @repp_logs.page(params[:page])
       @count = @q.result.count
-      @repp_logs = @repp_logs.per(params[:results_per_page]) if params[:results_per_page].to_i.positive?
+      @repp_logs = @repp_logs.per(params[:results_per_page]) if paginate?
     end
 
     def show
diff --git a/app/views/admin/dns/zones/index.html.erb b/app/views/admin/dns/zones/index.html.erb
index 1068f3c7b..05554ceff 100644
--- a/app/views/admin/dns/zones/index.html.erb
+++ b/app/views/admin/dns/zones/index.html.erb
@@ -33,7 +33,7 @@
     </div>
     <div class="col-md-6 text-right">
         <div class="pagination">
-            <%= t(:result_count, count: @count) %>
+            <%= t(:result_count, count: @q.result.count) %>
         </div>
     </div>
 </div>
diff --git a/app/views/admin/invoices/index.haml b/app/views/admin/invoices/index.haml
index 336401b0d..ede0b5c3c 100644
--- a/app/views/admin/invoices/index.haml
+++ b/app/views/admin/invoices/index.haml
@@ -38,4 +38,4 @@
     = paginate @invoices
   .col-md-6.text-right
     .pagination
-      = t(:result_count, count: @count)
+      = t(:result_count, count: @q.result.count)
diff --git a/app/views/admin/registrars/index.html.erb b/app/views/admin/registrars/index.html.erb
index ba1c06f6d..7095fd0ef 100644
--- a/app/views/admin/registrars/index.html.erb
+++ b/app/views/admin/registrars/index.html.erb
@@ -69,7 +69,7 @@
     </div>
     <div class="col-md-6 text-right">
         <div class="pagination">
-            <%= t(:result_count, count: @count) %>
+            <%= t(:result_count, count: @q.result.count) %>
         </div>
     </div>
 </div>