diff --git a/app/controllers/admin/reports_controller.rb b/app/controllers/admin/reports_controller.rb
index cb343d0ac2..cfdabcbbd7 100644
--- a/app/controllers/admin/reports_controller.rb
+++ b/app/controllers/admin/reports_controller.rb
@@ -48,10 +48,7 @@ module Admin
                       else
                         I18n.t(:name, scope: [:admin, :reports, @report_type])
                       end
-
-      # Initialize data
-      @params_fields_to_show = render_options.options[:fields_to_show]
-
+      @rendering_options = rendering_options
       @data = Reporting::FrontendData.new(spree_current_user)
     end
   end
diff --git a/app/controllers/concerns/reports_actions.rb b/app/controllers/concerns/reports_actions.rb
index cf0aebad90..fce15767df 100644
--- a/app/controllers/concerns/reports_actions.rb
+++ b/app/controllers/concerns/reports_actions.rb
@@ -63,8 +63,8 @@ module ReportsActions
     'admin.reports'
   end
 
-  def render_options
-    @render_options ||= ReportRenderingOptions.where(
+  def rendering_options
+    @rendering_options ||= ReportRenderingOptions.where(
       user: spree_current_user,
       report_type: report_type,
       report_subtype: report_subtype
@@ -78,11 +78,11 @@ module ReportsActions
       params[:display_header_row] = params[:display_header_row].present?
     end
     if params[:fields_to_show].present?
-      @render_options.options[:fields_to_show] = params[:fields_to_show]
+      @rendering_options.options[:fields_to_show] = params[:fields_to_show]
     end
-    @render_options.options[:display_summary_row] = params[:display_summary_row].present?
-    @render_options.options[:display_header_row] = params[:display_header_row].present?
-    @render_options.save
-    @render_options
+    @rendering_options.options[:display_summary_row] = params[:display_summary_row].present?
+    @rendering_options.options[:display_header_row] = params[:display_header_row].present?
+    @rendering_options.save
+    @rendering_options
   end
 end
diff --git a/app/views/admin/reports/_rendering_options.html.haml b/app/views/admin/reports/_rendering_options.html.haml
index 8ba2a4a1ba..a075f47bef 100644
--- a/app/views/admin/reports/_rendering_options.html.haml
+++ b/app/views/admin/reports/_rendering_options.html.haml
@@ -16,16 +16,16 @@
       .omega.fourteen.columns
         - if @report.header_option?
           %span.inline-checkbox{ style: "margin-right: 1rem;" }
-            = check_box_tag :display_header_row, true, params[:display_header_row]
+            = check_box_tag :display_header_row, true, @render_options.options[:display_header_row]
             = label_tag :display_header_row, t(".header_row")
         - if @report.summary_row_option?
           %span.inline-checkbox
-            = check_box_tag :display_summary_row, true, params[:display_summary_row], { "data-csv-select-target": "checkbox" }
+            = check_box_tag :display_summary_row, true, @render_options.options[:display_summary_row], { "data-csv-select-target": "checkbox" }
             = label_tag :display_summary_row, t(".summary_row"), { "data-csv-select-target": "label" }
 
 - if @report.available_headers.present?
   .row
     .alpha.two.columns= label_tag nil, t(:report_columns)
     .omega.fourteen.columns
-      = render MultipleCheckedSelectComponent.new(name: "fields_to_show", options: @report.available_headers, selected: @params_fields_to_show)
+      = render MultipleCheckedSelectComponent.new(name: "fields_to_show", options: @report.available_headers, selected: @render_options.options[:fields_to_show])
   
\ No newline at end of file