diff --git a/src/modules/ekf2/EKF/ekf.h b/src/modules/ekf2/EKF/ekf.h
index 27026f531f..a9269bdcb1 100644
--- a/src/modules/ekf2/EKF/ekf.h
+++ b/src/modules/ekf2/EKF/ekf.h
@@ -1036,6 +1036,9 @@ private:
 	// Returns true if the reset was successful
 	bool resetYawToEKFGSF();
 
+	// Returns true if the output of the yaw emergency estimator can be used for a reset
+	bool isYawEmergencyEstimateAvailable() const;
+
 	void resetGpsDriftCheckFilters();
 };
 
diff --git a/src/modules/ekf2/EKF/ekf_helper.cpp b/src/modules/ekf2/EKF/ekf_helper.cpp
index ce2514dd26..f4ea06d8f5 100644
--- a/src/modules/ekf2/EKF/ekf_helper.cpp
+++ b/src/modules/ekf2/EKF/ekf_helper.cpp
@@ -1727,21 +1727,11 @@ void Ekf::resetQuatStateYaw(float yaw, float yaw_variance, bool update_buffer)
 // Returns true if the reset was successful
 bool Ekf::resetYawToEKFGSF()
 {
-	// don't allow reet using the EKF-GSF estimate until the filter has started fusing velocity
-	// data and the yaw estimate has converged
-	if (!_yawEstimator.isActive()) {
+	if (!isYawEmergencyEstimateAvailable()) {
 		return false;
 	}
 
-	const float new_yaw_variance = _yawEstimator.getYawVar();
-	const bool has_converged = new_yaw_variance < sq(_params.EKFGSF_yaw_err_max);
-
-	if (!has_converged) {
-		return false;
-	}
-
-	const float new_yaw = _yawEstimator.getYaw();
-	resetQuatStateYaw(new_yaw, new_yaw_variance, true);
+	resetQuatStateYaw(_yawEstimator.getYaw(), _yawEstimator.getYawVar(), true);
 
 	// reset velocity and position states to GPS - if yaw is fixed then the filter should start to operate correctly
 	resetVelocity();
@@ -1782,6 +1772,17 @@ bool Ekf::resetYawToEKFGSF()
 	return true;
 }
 
+bool Ekf::isYawEmergencyEstimateAvailable() const
+{
+	// don't allow reet using the EKF-GSF estimate until the filter has started fusing velocity
+	// data and the yaw estimate has converged
+	if (!_yawEstimator.isActive()) {
+		return false;
+	}
+
+	return _yawEstimator.getYawVar() < sq(_params.EKFGSF_yaw_err_max);
+}
+
 bool Ekf::getDataEKFGSF(float *yaw_composite, float *yaw_variance, float yaw[N_MODELS_EKFGSF],
 			float innov_VN[N_MODELS_EKFGSF], float innov_VE[N_MODELS_EKFGSF], float weight[N_MODELS_EKFGSF])
 {