diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index f5d714884..9078a7fda 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1453,7 +1453,6 @@ Style/VariableInterpolation:
 # Cop supports --auto-correct.
 Style/WhileUntilModifier:
   Exclude:
-    - 'app/helpers/queries_helper.rb'
     - 'app/models/attachment.rb'
     - 'app/models/project.rb'
     - 'lib/redmine/unified_diff.rb'
diff --git a/app/helpers/queries_helper.rb b/app/helpers/queries_helper.rb
index a9dce7456..fa03a76ef 100644
--- a/app/helpers/queries_helper.rb
+++ b/app/helpers/queries_helper.rb
@@ -180,10 +180,8 @@ module QueriesHelper
         end
       end
       param_key = options[:sort_param] || :sort
-      sort_param = { param_key => query.sort_criteria.add(column.name, order).to_param }
-      while sort_param.keys.first.to_s =~ /^(.+)\[(.+)\]$/
-        sort_param = {$1 => {$2 => sort_param.values.first}}
-      end
+      sort_param = {param_key => query.sort_criteria.add(column.name, order).to_param}
+      sort_param = {$1 => {$2 => sort_param.values.first}} while sort_param.keys.first.to_s =~ /^(.+)\[(.+)\]$/
       link_options = {
           :title => l(:label_sort_by, "\"#{column.caption}\""),
           :class => css