diff --git a/src/relations.jl b/src/relations.jl
index e69ebef6..4a361462 100644
--- a/src/relations.jl
+++ b/src/relations.jl
@@ -2778,7 +2778,7 @@ vol_vapor_mixing_ratio(param_set, ts::ThermodynamicState) =
 """
     relative_humidity(param_set, T, p, phase_type, q::PhasePartition)
 
-The relative humidity, given
+The relative humidity (clipped between 0 and 1), given
  - `param_set` an `AbstractParameterSet`, see the [`Thermodynamics`](@ref) for more details
  - `p` pressure
  - `phase_type` a thermodynamic state type
@@ -2796,7 +2796,7 @@ and, optionally,
     q_vap = vapor_specific_humidity(q)
     p_vap = q_vap * air_density(param_set, T, p, q) * R_v * T
     p_vap_sat = saturation_vapor_pressure(param_set, phase_type, T)
-    return p_vap / p_vap_sat
+    return max(FT(0), min(FT(1), p_vap / (p_vap_sat + eps(FT(0)))))
 end
 
 """
diff --git a/test/relations.jl b/test/relations.jl
index 53e76650..d065c4c8 100644
--- a/test/relations.jl
+++ b/test/relations.jl
@@ -499,6 +499,19 @@ end
     vmrs = vol_vapor_mixing_ratio(param_set, q)
     q_vap = vapor_specific_humidity(q)
     @test vmrs ≈ _molmass_ratio * shum_to_mixing_ratio(q_vap, q.tot)
+
+    # Relative humidity sanity checks
+    for phase_type in [PhaseDry, PhaseEquil, PhaseNonEquil]
+        for T in [FT(40), FT(140), FT(240), FT(340), FT(440)]
+            for p in [FT(1e3), FT(1e4), FT(1e5)]
+                for q in [FT(-1), FT(1e-45), FT(0), FT(1e-3), FT(10)]
+                    q_pt = PhasePartition(FT(q))
+                    RH = relative_humidity(param_set, T, p, phase_type, q_pt)
+                    @test RH >= FT(0) && RH <= FT(1)
+                end
+            end
+        end
+    end
 end