diff --git a/src/drivers/bmi160/bmi160.cpp b/src/drivers/bmi160/bmi160.cpp
index 860eea2641..91a11f5a14 100644
--- a/src/drivers/bmi160/bmi160.cpp
+++ b/src/drivers/bmi160/bmi160.cpp
@@ -1288,8 +1288,8 @@ BMI160::measure()
 	arb.temperature_raw = report.temp;
 	arb.temperature = _last_temperature;
 
-	/* Return class instance as a surrogate device ID */
-	arb.device_id = _device_id;
+	/* return device ID */
+	arb.device_id = _device_id.devid;
 
 	grb.x_raw = report.gyro_x;
 	grb.y_raw = report.gyro_y;
@@ -1324,8 +1324,8 @@ BMI160::measure()
 	grb.temperature_raw = report.temp;
 	grb.temperature = _last_temperature;
 
-	/* Use class instance as a surrogate hardware ID */
-	grb.device_id = _gyro->_gyro_class_instance;
+	/* return device ID */
+	grb.device_id = _gyro->_device_id.devid;;
 
 	_accel_reports->force(&arb);
 	_gyro_reports->force(&grb);
diff --git a/src/drivers/bmp280/bmp280.cpp b/src/drivers/bmp280/bmp280.cpp
index 2160f58f70..5963806eb4 100644
--- a/src/drivers/bmp280/bmp280.cpp
+++ b/src/drivers/bmp280/bmp280.cpp
@@ -543,8 +543,8 @@ BMP280::collect()
 	report.temperature = _T;
 	report.pressure = _P / 100.0f; // to mbar
 
-	/* TODO get device ID for sensor */
-	report.device_id = _device_id;
+	/* Get device ID */
+	report.device_id = _device_id.devid;
 
 	/* altitude calculations based on http://www.kansasflyer.org/index.asp?nav=Avi&sec=Alti&tab=Theory&pg=1 */
 
diff --git a/src/drivers/lps25h/lps25h.cpp b/src/drivers/lps25h/lps25h.cpp
index 17cc2e9a7e..36893d21fd 100644
--- a/src/drivers/lps25h/lps25h.cpp
+++ b/src/drivers/lps25h/lps25h.cpp
@@ -743,8 +743,8 @@ LPS25H::collect()
 	new_report.pressure = p;
 	new_report.altitude = alt;
 
-	/* TODO get device ID for sensor */
-	new_report.device_id = _device_id;
+	/* get device ID */
+	new_report.device_id = _device_id.devid;
 
 	if (!(_pub_blocked)) {