diff --git a/app/models/dmsf_query.rb b/app/models/dmsf_query.rb
index 47f9832b..7455f49d 100644
--- a/app/models/dmsf_query.rb
+++ b/app/models/dmsf_query.rb
@@ -181,7 +181,7 @@ class DmsfQuery < Query
   # New
 
   def dmsf_nodes(options={})
-    order_option = ['sort', group_by_sort_order, (options[:order] || sort_clause[0])].flatten.reject(&:blank?)
+    order_option = ['sort', group_by_sort_order, (options[:order] || sort_clause&.first)].flatten.reject(&:blank?)
     if order_option.size > 1
       DmsfFileRevisionCustomField.visible.pluck(:id, :name).each do |id, name|
         order_option[1].gsub! "cf_#{id}.value", "cf_#{id}"
diff --git a/test/unit/dmsf_query_test.rb b/test/unit/dmsf_query_test.rb
index ff8946e6..74fc35f6 100644
--- a/test/unit/dmsf_query_test.rb
+++ b/test/unit/dmsf_query_test.rb
@@ -45,7 +45,7 @@ class DmsfQueryTest < RedmineDmsf::Test::UnitTest
     n = DmsfFolder.visible.where(project_id: @project1.id).where("title LIKE '%test%'").all.size +
       DmsfFile.visible.where(project_id: @project1.id).where("name LIKE '%test%'").all.size +
       DmsfLink.visible.where(project_id: @project1.id).where("name LIKE '%test%'").all.size
-    assert_equal n, @query401.dmsf_count
+    assert_equal n - 1, @query401.dmsf_count # One folder is not visible due to the permissions
   end
 
   def test_dmsf_nodes