diff --git a/src/modules/Telemetry/Sensor/SEN5XSensor.cpp b/src/modules/Telemetry/Sensor/SEN5XSensor.cpp
index dc505fec8..d5f04ce94 100644
--- a/src/modules/Telemetry/Sensor/SEN5XSensor.cpp
+++ b/src/modules/Telemetry/Sensor/SEN5XSensor.cpp
@@ -430,18 +430,16 @@ bool SEN5XSensor::readValues()
 
     // TODO we should check if values are NAN before converting them
     // convert them based on Sensirion Arduino lib
-    // TODO - Change based on the type of final values
-    sen5xmeasurement.pM1p0          = uint_pM1p0      / 10.0f;
-    sen5xmeasurement.pM2p5          = uint_pM2p5      / 10.0f;
-    sen5xmeasurement.pM4p0          = uint_pM4p0      / 10.0f;
-    sen5xmeasurement.pM10p0         = uint_pM10p0     / 10.0f;
+    sen5xmeasurement.pM1p0          = uint_pM1p0      / 10;
+    sen5xmeasurement.pM2p5          = uint_pM2p5      / 10;
+    sen5xmeasurement.pM4p0          = uint_pM4p0      / 10;
+    sen5xmeasurement.pM10p0         = uint_pM10p0     / 10;
     sen5xmeasurement.humidity       = int_humidity    / 100.0f;
     sen5xmeasurement.temperature    = int_temperature / 200.0f;
     sen5xmeasurement.vocIndex       = int_vocIndex    / 10.0f;
     sen5xmeasurement.noxIndex       = int_noxIndex    / 10.0f;
 
-    // TODO - change depending on the final values
-    LOG_DEBUG("Got: pM1p0=%.2f, pM2p5=%.2f, pM4p0=%.2f, pM10p0=%.2f",
+    LOG_DEBUG("Got: pM1p0=%u, pM2p5=%u, pM4p0=%u, pM10p0=%u",
                 sen5xmeasurement.pM1p0, sen5xmeasurement.pM2p5,
                 sen5xmeasurement.pM4p0, sen5xmeasurement.pM10p0);
 
@@ -454,6 +452,7 @@ bool SEN5XSensor::readPnValues()
         LOG_ERROR("SEN5X: Error sending read command");
         return false;
     }
+
     LOG_DEBUG("SEN5X: Reading PN Values");
     delay(20); // From Sensirion Arduino library
 
diff --git a/src/modules/Telemetry/Sensor/SEN5XSensor.h b/src/modules/Telemetry/Sensor/SEN5XSensor.h
index 71b32a6f6..8782c3b92 100644
--- a/src/modules/Telemetry/Sensor/SEN5XSensor.h
+++ b/src/modules/Telemetry/Sensor/SEN5XSensor.h
@@ -22,13 +22,11 @@
 
 #define ONE_WEEK_IN_SECONDS 604800
 
-// TODO - These are currently ints in the protobuf
-// Decide on final type for this values and change accordingly
 struct _SEN5XMeasurements {
-    float pM1p0;
-    float pM2p5;
-    float pM4p0;
-    float pM10p0;
+    uint16_t pM1p0;
+    uint16_t pM2p5;
+    uint16_t pM4p0;
+    uint16_t pM10p0;
     uint32_t pN0p5;
     uint32_t pN1p0;
     uint32_t pN2p5;