diff --git a/src/modules/temperature_compensation/temperature_calibration/accel.cpp b/src/modules/temperature_compensation/temperature_calibration/accel.cpp
index d9d4ef2ae6..9dc6c071f8 100644
--- a/src/modules/temperature_compensation/temperature_calibration/accel.cpp
+++ b/src/modules/temperature_compensation/temperature_calibration/accel.cpp
@@ -225,5 +225,16 @@ int TemperatureCalibrationAccel::finish_sensor_instance(PerSensorData &data, int
 	set_parameter("TC_A%d_TMAX", sensor_index, &data.high_temp);
 	set_parameter("TC_A%d_TMIN", sensor_index, &data.low_temp);
 	set_parameter("TC_A%d_TREF", sensor_index, &data.ref_temp);
+
+	// reset current calibration (covered by TC parameters)
+	float offset = 0.0f;
+	float scale = 1.0f;
+	set_parameter("CAL_ACC%u_XOFF", sensor_index, &offset);
+	set_parameter("CAL_ACC%u_YOFF", sensor_index, &offset);
+	set_parameter("CAL_ACC%u_ZOFF", sensor_index, &offset);
+	set_parameter("CAL_ACC%u_XSCALE", sensor_index, &scale);
+	set_parameter("CAL_ACC%u_YSCALE", sensor_index, &scale);
+	set_parameter("CAL_ACC%u_ZSCALE", sensor_index, &scale);
+
 	return 0;
 }
diff --git a/src/modules/temperature_compensation/temperature_calibration/baro.cpp b/src/modules/temperature_compensation/temperature_calibration/baro.cpp
index bd535e3432..4d1dc7be90 100644
--- a/src/modules/temperature_compensation/temperature_calibration/baro.cpp
+++ b/src/modules/temperature_compensation/temperature_calibration/baro.cpp
@@ -209,5 +209,10 @@ int TemperatureCalibrationBaro::finish_sensor_instance(PerSensorData &data, int
 	set_parameter("TC_B%d_TMAX", sensor_index, &data.high_temp);
 	set_parameter("TC_B%d_TMIN", sensor_index, &data.low_temp);
 	set_parameter("TC_B%d_TREF", sensor_index, &data.ref_temp);
+
+	// reset current calibration (covered by TC parameters)
+	float offset = 0.0f;
+	set_parameter("CAL_BARO%u_OFF", sensor_index, &offset);
+
 	return 0;
 }
diff --git a/src/modules/temperature_compensation/temperature_calibration/gyro.cpp b/src/modules/temperature_compensation/temperature_calibration/gyro.cpp
index 22cb0f1fc0..0f0f9c4a1e 100644
--- a/src/modules/temperature_compensation/temperature_calibration/gyro.cpp
+++ b/src/modules/temperature_compensation/temperature_calibration/gyro.cpp
@@ -211,5 +211,11 @@ int TemperatureCalibrationGyro::finish_sensor_instance(PerSensorData &data, int
 	set_parameter("TC_G%d_TMIN", sensor_index, &data.low_temp);
 	set_parameter("TC_G%d_TREF", sensor_index, &data.ref_temp);
 
+	// reset current calibration (covered by TC parameters)
+	float offset = 0.0f;
+	set_parameter("CAL_GYRO%u_XOFF", sensor_index, &offset);
+	set_parameter("CAL_GYRO%u_YOFF", sensor_index, &offset);
+	set_parameter("CAL_GYRO%u_ZOFF", sensor_index, &offset);
+
 	return 0;
 }