diff --git a/app/controllers/admin/invoices_controller.rb b/app/controllers/admin/invoices_controller.rb
index 96988a464..68db492d8 100644
--- a/app/controllers/admin/invoices_controller.rb
+++ b/app/controllers/admin/invoices_controller.rb
@@ -93,10 +93,10 @@ module Admin
 
     def filter_by_receipt_date(invoices)
       date_from_param = params[:q][:receipt_date_gteq] if params[:q][:receipt_date_gteq].present?
-      date_from = date_from_param ? Time.zone.parse(date_from_param) : -Float::INFINITY
+      date_from = date_from_param ? Time.zone.parse(date_from_param) : nil
 
       date_until_param = params[:q][:receipt_date_lteq] if params[:q][:receipt_date_lteq].present?
-      date_until = date_until_param ? Time.zone.parse(date_until_param) : Float::INFINITY
+      date_until = date_until_param ? Time.zone.parse(date_until_param) : nil
 
       invoices.where(account_activities: { created_at: date_from..date_until })
     end