diff --git a/app/controllers/dmsf_files_controller.rb b/app/controllers/dmsf_files_controller.rb
index a988bc09..b12e138a 100644
--- a/app/controllers/dmsf_files_controller.rb
+++ b/app/controllers/dmsf_files_controller.rb
@@ -85,7 +85,8 @@ class DmsfFilesController < ApplicationController
     @revision = @file.last_revision
     @file_delete_allowed = User.current.allowed_to?(:file_delete, @project)
     @file_manipulation_allowed = User.current.allowed_to?(:file_manipulation, @project)
-    @revision_pages = Paginator.new @file.dmsf_file_revisions.visible.count, params['per_page'] ? params['per_page'].to_i : 25, params['page']
+    @revision_count = @file.dmsf_file_revisions.visible.all.size
+    @revision_pages = Paginator.new @revision_count, params['per_page'] ? params['per_page'].to_i : 25, params['page']
 
     respond_to do |format|
       format.html {
diff --git a/app/views/dmsf_files/_revision_access.html.erb b/app/views/dmsf_files/_revision_access.html.erb
index 937297cf..92bcbe5f 100644
--- a/app/views/dmsf_files/_revision_access.html.erb
+++ b/app/views/dmsf_files/_revision_access.html.erb
@@ -44,4 +44,3 @@
     </tbody>
   </table>
 </div>
-<span class="pagination"><%= pagination_links_full revision_access_pages, revision_access_count %></span>
diff --git a/app/views/dmsf_files/show.html.erb b/app/views/dmsf_files/show.html.erb
index e0e7a9d5..4ace6ff5 100644
--- a/app/views/dmsf_files/show.html.erb
+++ b/app/views/dmsf_files/show.html.erb
@@ -158,20 +158,14 @@
         <% if @file_manipulation_allowed %>
           <% revision_access_query = DmsfFileRevisionAccessQuery.new %>
           <% revision_access_query.revision_id = revision.id  %>
-          <% revision_access_count = revision_access_query.access_count  %>
-          <% revision_access_pages = Redmine::Pagination::Paginator.new revision_access_count,
-               Setting.per_page_options_array.first || 25, params['page'] %>
-          <%= render partial: 'revision_access', locals: { revision: revision, query: revision_access_query,
-                                                           revision_access_count: revision_access_count,
-                                                           revision_access_pages: revision_access_pages } %>
+          <%= render partial: 'revision_access', locals: { revision: revision, query: revision_access_query } %>
         <% end %>
       </div>
     </div>
   </div>
   <br/>
 <% end %>
-
-<span class="pagination"><%= pagination_links_full @revision_pages, @file.dmsf_file_revisions.visible.count %></span>
+<span class="pagination"><%= pagination_links_full @revision_pages, @revision_count %></span>
 
 <%= late_javascript_tag do %>
   $('a.delete-revision').click(function(event) {