diff --git a/app/controllers/dmsf_files_controller.rb b/app/controllers/dmsf_files_controller.rb
index 5ca5f120..af1b732b 100644
--- a/app/controllers/dmsf_files_controller.rb
+++ b/app/controllers/dmsf_files_controller.rb
@@ -86,10 +86,10 @@ class DmsfFilesController < ApplicationController
     @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_access_query = retrieve_query(DmsfFileRevisionAccessQuery, true)
-    @revision_access_query.revision_id = @revision.id
-    @revision_access_count = @revision_access_query.access_count
-    @revision_access_pages = Paginator.new @revision_access_count, per_page_option, params['page']
+    #@revision_access_query = retrieve_query(DmsfFileRevisionAccessQuery, false)
+    # @revision_access_query.revision_id = @revision.id
+    # @revision_access_count = @revision_access_query.access_count
+    # @revision_access_pages = Paginator.new @revision_access_count, per_page_option, params['page']
 
     respond_to do |format|
       format.html {
diff --git a/app/views/dmsf_files/show.html.erb b/app/views/dmsf_files/show.html.erb
index 29eb38c0..42c5c219 100644
--- a/app/views/dmsf_files/show.html.erb
+++ b/app/views/dmsf_files/show.html.erb
@@ -73,12 +73,12 @@
         <% if defined?(EasyExtensions) %>
           <%= render partial: 'dmsf_context_menus/revision_actions',
                      locals: { project: @project, file: @file, file_delete_allowed: @file_delete_allowed,
-                               file_manipulation_allowed: @file_manipulation_allowed, revision: @revision } %>
+                               file_manipulation_allowed: @file_manipulation_allowed, revision: revision } %>
         <% else %>
           <%= actions_dropdown do %>
             <%= render partial: 'dmsf_context_menus/revision_actions',
                        locals: { project: @project, file: @file, file_delete_allowed: @file_delete_allowed,
-                                 file_manipulation_allowed: @file_manipulation_allowed, revision: @revision } %>
+                                 file_manipulation_allowed: @file_manipulation_allowed, revision: revision } %>
           <% end %>
         <% end %>
       </div>
@@ -156,9 +156,14 @@
       </div>
       <div id="<%= "revision_access-#{revision.id}" %>" style="display:none">
         <% if @file_manipulation_allowed %>
-          <%= render partial: 'revision_access', locals: { revision: revision, query: @query,
-                                                           revision_access_count: @revision_access_count,
-                                                           revision_access_pages: @revision_access_pages } %>
+          <% 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 } %>
         <% end %>
       </div>
     </div>