diff --git a/src/lib/sensor_calibration/Accelerometer.cpp b/src/lib/sensor_calibration/Accelerometer.cpp
index 4344952894..bd8c9b96cb 100644
--- a/src/lib/sensor_calibration/Accelerometer.cpp
+++ b/src/lib/sensor_calibration/Accelerometer.cpp
@@ -203,9 +203,10 @@ void Accelerometer::ParametersUpdate()
 			if (_priority != -1) {
 				PX4_ERR("%s %" PRIu32 " (%" PRId8 ") invalid priority %" PRId32 ", resetting to %" PRId32, SensorString(), _device_id,
 					_calibration_index, _priority, new_priority);
+
+				SetCalibrationParam(SensorString(), "PRIO", _calibration_index, new_priority);
 			}
 
-			SetCalibrationParam(SensorString(), "PRIO", _calibration_index, new_priority);
 			_priority = new_priority;
 		}
 
diff --git a/src/lib/sensor_calibration/Gyroscope.cpp b/src/lib/sensor_calibration/Gyroscope.cpp
index 44dfa64ca9..815e782036 100644
--- a/src/lib/sensor_calibration/Gyroscope.cpp
+++ b/src/lib/sensor_calibration/Gyroscope.cpp
@@ -188,9 +188,10 @@ void Gyroscope::ParametersUpdate()
 			if (_priority != -1) {
 				PX4_ERR("%s %" PRIu32 " (%" PRId8 ") invalid priority %" PRId32 ", resetting to %" PRId32, SensorString(), _device_id,
 					_calibration_index, _priority, new_priority);
+
+				SetCalibrationParam(SensorString(), "PRIO", _calibration_index, new_priority);
 			}
 
-			SetCalibrationParam(SensorString(), "PRIO", _calibration_index, new_priority);
 			_priority = new_priority;
 		}
 
diff --git a/src/lib/sensor_calibration/Magnetometer.cpp b/src/lib/sensor_calibration/Magnetometer.cpp
index 878ff04059..54011e2858 100644
--- a/src/lib/sensor_calibration/Magnetometer.cpp
+++ b/src/lib/sensor_calibration/Magnetometer.cpp
@@ -188,9 +188,10 @@ void Magnetometer::ParametersUpdate()
 			if (_priority != -1) {
 				PX4_ERR("%s %" PRIu32 " (%" PRId8 ") invalid priority %" PRId32 ", resetting to %" PRId32, SensorString(), _device_id,
 					_calibration_index, _priority, new_priority);
+
+				SetCalibrationParam(SensorString(), "PRIO", _calibration_index, new_priority);
 			}
 
-			SetCalibrationParam(SensorString(), "PRIO", _calibration_index, new_priority);
 			_priority = new_priority;
 		}