diff --git a/app/views/lab_tests/_date_filter.html.erb b/app/views/lab_tests/_date_filter.html.erb
index d7501c7..d4cf2c2 100644
--- a/app/views/lab_tests/_date_filter.html.erb
+++ b/app/views/lab_tests/_date_filter.html.erb
@@ -3,18 +3,18 @@
     <div class="inline-flex items-center">
         <span class="mr-3 text-sm font-medium"><%= t('.from') %></span>
         <%= f.date_field :start_date, 
-          value: params[:start_date] || Date.today.beginning_of_year,
-          min: "1900-01-01",
-          max: "2100-01-01",
+          value: params[:start_date] || Rails.application.config.x.dates[:default_start_date].call,
+          min: Rails.application.config.x.dates[:min_date],
+          max: Rails.application.config.x.dates[:max_date],
           onchange: "this.nextElementSibling.nextElementSibling.min=this.value",
           class: "rounded-md border border-gray-300 py-2 px-3 mr-6",
           placeholder: "mm/dd/yyyy" %>
 
         <span class="mr-3 text-sm font-medium"><%= t('.to') %></span>
         <%= f.date_field :end_date, 
-          value: params[:end_date] || Date.today,
-          min: params[:start_date] || "1900-01-01",
-          max: "2100-01-01",
+          value: params[:end_date] || Rails.application.config.x.dates[:default_end_date].call,
+          min: params[:start_date] || Rails.application.config.x.dates[:min_date],
+          max: Rails.application.config.x.dates[:max_date],
           class: "rounded-md border border-gray-300 py-2 px-3 mr-6",
           placeholder: "mm/dd/yyyy" %>
 
diff --git a/config/application.rb b/config/application.rb
index fab9667..6e7f65f 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -44,5 +44,13 @@ class Application < Rails::Application
     # Fixes broken tailwind.css build for CI
     # @see https://github.com/rails/tailwindcss-rails/issues/153#issuecomment-1225895063
     config.assets.css_compressor = nil
+
+    # Date range settings for lab tests
+    config.x.dates = {
+      min_date: '1900-01-01',
+      max_date: '2100-01-01',
+      default_start_date: -> { Date.today.beginning_of_year },
+      default_end_date: -> { Date.today }
+    }
   end
 end