diff --git a/src/modules/commander/accelerometer_calibration.cpp b/src/modules/commander/accelerometer_calibration.cpp
index 9d34b2bf1c..b5a49192e9 100644
--- a/src/modules/commander/accelerometer_calibration.cpp
+++ b/src/modules/commander/accelerometer_calibration.cpp
@@ -345,7 +345,11 @@ int do_accel_calibration(orb_advert_t *mavlink_log_pub)
 				} else if (axis_index == 2) {
 					val *= accel_scale.z_scale;
 				}
-				failed |= (PX4_OK != param_set_no_notification(handle, &val));
+				if (axis_index == 2) { //notify the system about the change, but only once, for the last one
+					failed |= (PX4_OK != param_set(handle, &val));
+				} else {
+					failed |= (PX4_OK != param_set_no_notification(handle, &val));
+				}
 			}
 
 			// Ensure the calibration values used the driver are at default settings
diff --git a/src/modules/commander/gyro_calibration.cpp b/src/modules/commander/gyro_calibration.cpp
index 8e3034c007..44bac9521a 100644
--- a/src/modules/commander/gyro_calibration.cpp
+++ b/src/modules/commander/gyro_calibration.cpp
@@ -392,7 +392,11 @@ int do_gyro_calibration(orb_advert_t *mavlink_log_pub)
 						} else if (axis_index == 2) {
 							val += worker_data.gyro_scale[uorb_index].z_offset;
 						}
-						failed |= (PX4_OK != param_set_no_notification(handle, &val));
+						if (axis_index == 2) { //notify the system about the change, but only once, for the last one
+							failed |= (PX4_OK != param_set(handle, &val));
+						} else {
+							failed |= (PX4_OK != param_set_no_notification(handle, &val));
+						}
 					}
 					// Ensure the calibration values used the driver are at default settings
 					worker_data.gyro_scale[uorb_index].x_offset = 0.f;