diff --git a/app/components/document_advanced_search_component.rb b/app/components/document_advanced_search_component.rb
index b392792..d98e78f 100644
--- a/app/components/document_advanced_search_component.rb
+++ b/app/components/document_advanced_search_component.rb
@@ -6,8 +6,8 @@ class DocumentAdvancedSearchComponent < BaseComponent
   end
 
   def years
-    start_year = Cdao::Jurisprudence.order(year: :desc).first(10).compact.map(&:year).uniq.first
-    end_year = Cdao::Jurisprudence.order(year: :asc).last(10).compact.map(&:year).uniq.first
+    start_year = Cdao::Jurisprudence.order(year: :asc).first(10).compact.map(&:year).uniq.first || "1900"
+    end_year = Cdao::Jurisprudence.order(year: :desc).last(10).compact.map(&:year).uniq.last || Time.zone.today.year
     (start_year..end_year).entries.reverse
   end
 end
diff --git a/app/controllers/api/jurisprudences_controller.rb b/app/controllers/api/jurisprudences_controller.rb
index b88077a..2ee8162 100644
--- a/app/controllers/api/jurisprudences_controller.rb
+++ b/app/controllers/api/jurisprudences_controller.rb
@@ -19,8 +19,8 @@ module Api
     def years
       authorize! :index, Cdao::Jurisprudence
 
-      start_year = Cdao::Jurisprudence.order(year: :desc).first(10).compact.map(&:year).uniq.first
-      end_year = Cdao::Jurisprudence.order(year: :asc).last(10).compact.map(&:year).uniq.first
+      start_year = Cdao::Jurisprudence.order(year: :asc).first(10).compact.map(&:year).uniq.first || "1900"
+    end_year = Cdao::Jurisprudence.order(year: :desc).last(10).compact.map(&:year).uniq.last || Time.zone.today.year
       @years = (start_year..end_year).entries.reverse
 
       respond_with @years
diff --git a/app/controllers/decisions_controller.rb b/app/controllers/decisions_controller.rb
index e2e334f..b6db915 100644
--- a/app/controllers/decisions_controller.rb
+++ b/app/controllers/decisions_controller.rb
@@ -10,8 +10,8 @@ class DecisionsController < ApplicationController
 
     @jurisprudences = search.results
 
-    start_year = Cdao::Jurisprudence.order(year: :desc).first(10).compact.map(&:year).uniq.first
-    end_year = Cdao::Jurisprudence.order(year: :asc).last(10).compact.map(&:year).uniq.first
+    start_year = Cdao::Jurisprudence.order(year: :asc).first(10).compact.map(&:year).uniq.first || "1900"
+    end_year = Cdao::Jurisprudence.order(year: :desc).last(10).compact.map(&:year).uniq.last || Time.zone.today.year
     @years = (start_year..end_year).entries.reverse
 
     respond_to do |format|