diff --git a/src/drivers/barometer/invensense/icp10100/Kconfig b/src/drivers/barometer/invensense/icp10100/Kconfig
deleted file mode 100644
index 2f883bccd4..0000000000
--- a/src/drivers/barometer/invensense/icp10100/Kconfig
+++ /dev/null
@@ -1,5 +0,0 @@
-menuconfig DRIVERS_BAROMETER_INVENSENSE_ICP10100
-	bool "icp10100"
-	default n
-	---help---
-		Enable support for icp10100
diff --git a/src/drivers/barometer/invensense/icp10111/Kconfig b/src/drivers/barometer/invensense/icp10111/Kconfig
deleted file mode 100644
index 1681c07d38..0000000000
--- a/src/drivers/barometer/invensense/icp10111/Kconfig
+++ /dev/null
@@ -1,6 +0,0 @@
-menuconfig DRIVERS_BAROMETER_INVENSENSE_ICP10111
-	bool "icp10100"
-	default n
-	---help---
-		Enable support for icp10111
-
diff --git a/src/drivers/barometer/ms5837/MS5837.cpp b/src/drivers/barometer/ms5837/MS5837.cpp
index 7041d886d9..00382070de 100644
--- a/src/drivers/barometer/ms5837/MS5837.cpp
+++ b/src/drivers/barometer/ms5837/MS5837.cpp
@@ -340,7 +340,7 @@ int MS5837::_collect()
 		sensor_baro.timestamp_sample = timestamp_sample;
 		sensor_baro.device_id = get_device_id();
 		sensor_baro.pressure = P;
-		sensor_baro.temperature = T;
+		sensor_baro.temperature = _last_temperature;
 		sensor_baro.error_count = perf_event_count(_comms_errors);
 		sensor_baro.timestamp = hrt_absolute_time();
 		_sensor_baro_pub.publish(sensor_baro);