diff --git a/EKF/range_finder_checks.cpp b/EKF/range_finder_checks.cpp
index 5ff08da384..bf54e50a7a 100644
--- a/EKF/range_finder_checks.cpp
+++ b/EKF/range_finder_checks.cpp
@@ -104,7 +104,7 @@ void Ekf::updateRangeDataValidity()
 
 	updateRangeDataStuck();
 
-	_rng_hgt_valid = !_control_status.flags.rng_stuck;
+	_rng_hgt_valid = _rng_hgt_valid && !_control_status.flags.rng_stuck;
 }
 
 void Ekf::updateRangeDataStuck()