diff --git a/app/components/shared/advanced_search_component.html.erb b/app/components/shared/advanced_search_component.html.erb
index e5333a321..0daf76477 100644
--- a/app/components/shared/advanced_search_component.html.erb
+++ b/app/components/shared/advanced_search_component.html.erb
@@ -35,7 +35,7 @@
                 <%= t("shared.advanced_search.from") %> (<%= t("shared.advanced_search.date_placeholder") %>)
               </label>
               <%= text_field_tag "advanced_search[date_min]",
-                                  params[:advanced_search].try(:[], :date_min),
+                                  advanced_search[:date_min],
                                   class: "js-calendar" %>
             </div>
             <div class="small-12 large-6 column">
@@ -43,7 +43,7 @@
                 <%= t("shared.advanced_search.to") %> (<%= t("shared.advanced_search.date_placeholder") %>)
               </label>
               <%= text_field_tag "advanced_search[date_max]",
-                                  params[:advanced_search].try(:[], :date_max),
+                                  advanced_search[:date_max],
                                   class: "js-calendar" %>
             </div>
           </div>
diff --git a/app/components/shared/advanced_search_component.rb b/app/components/shared/advanced_search_component.rb
index 1e0f1189b..c961aae19 100644
--- a/app/components/shared/advanced_search_component.rb
+++ b/app/components/shared/advanced_search_component.rb
@@ -3,12 +3,12 @@ class Shared::AdvancedSearchComponent < ApplicationComponent
   private
 
     def advanced_search
-      params[:advanced_search]
+      params[:advanced_search] || {}
     end
 
     def official_level_search_options
       options_for_select((1..5).map { |i| [setting["official_level_#{i}_name"], i] },
-                         params[:advanced_search].try(:[], :official_level))
+                         advanced_search[:official_level])
     end
 
     def date_range_options
@@ -22,10 +22,10 @@ class Shared::AdvancedSearchComponent < ApplicationComponent
     end
 
     def selected_date_range
-      custom_date_range? ? "custom" : params[:advanced_search].try(:[], :date_min)
+      custom_date_range? ? "custom" : advanced_search[:date_min]
     end
 
     def custom_date_range?
-      params[:advanced_search].try(:[], :date_max).present?
+      advanced_search[:date_max].present?
     end
 end