diff --git a/src/core/energy_storage/electric_storage.jl b/src/core/energy_storage/electric_storage.jl
index ccdb075c1..f2813d1e9 100644
--- a/src/core/energy_storage/electric_storage.jl
+++ b/src/core/energy_storage/electric_storage.jl
@@ -166,7 +166,7 @@ end
     degradation::Dict = Dict()
     minimum_avg_soc_fraction::Float64 = 0.0
     min_duration_hours::Real = 0.0 # Minimum amount of time storage can discharge at its rated power capacity
-    max_duration_hours::Real = 100000.0 # Maximum amount of time storage can discharge at its rated power capacity (ratio of ElectricStorage size_kwh to size_kw)
+    max_duration_hours::Real = 1000.0 # Maximum amount of time storage can discharge at its rated power capacity (ratio of ElectricStorage size_kwh to size_kw)
 ```
 """
 Base.@kwdef struct ElectricStorageDefaults
@@ -201,7 +201,7 @@ Base.@kwdef struct ElectricStorageDefaults
     degradation::Dict = Dict()
     minimum_avg_soc_fraction::Float64 = 0.0
     min_duration_hours::Real = 0.0
-    max_duration_hours::Real = 100000.0
+    max_duration_hours::Real = 1000.0
 end
 
 
diff --git a/src/core/energy_storage/thermal_storage.jl b/src/core/energy_storage/thermal_storage.jl
index 906d0ed50..85fdb6be7 100644
--- a/src/core/energy_storage/thermal_storage.jl
+++ b/src/core/energy_storage/thermal_storage.jl
@@ -41,7 +41,7 @@ Base.@kwdef struct ColdThermalStorageDefaults <: AbstractThermalStorageDefaults
     total_itc_fraction::Float64 = 0.3
     total_rebate_per_kwh::Float64 = 0.0
     min_duration_hours::Real = 0.0
-    max_duration_hours::Real = 9999999999.0
+    max_duration_hours::Real = 1000.0
 end
 
 
@@ -89,7 +89,7 @@ Base.@kwdef struct HotThermalStorageDefaults <: AbstractThermalStorageDefaults
     can_serve_space_heating::Bool = true
     can_serve_process_heat::Bool = false
     min_duration_hours::Real = 0.0
-    max_duration_hours::Real = 9999999999.0
+    max_duration_hours::Real = 1000.0
 end