diff --git a/src/modules/Telemetry/Sensor/RAK12035Sensor.cpp b/src/modules/Telemetry/Sensor/RAK12035Sensor.cpp
index 5f2b25c1b..491606117 100644
--- a/src/modules/Telemetry/Sensor/RAK12035Sensor.cpp
+++ b/src/modules/Telemetry/Sensor/RAK12035Sensor.cpp
@@ -111,11 +111,15 @@ bool RAK12035Sensor::getMetrics(meshtastic_Telemetry *measurement)
     measurement->variant.environment_metrics.soil_moisture = moisture;
 
     // temp code to get the values to the gui. will remove this once at least one of the clients is updated to use the new proto
-    if (variant.environment_metrics.temperature == 0 || variant.environment_metrics.temperature == null && variant.environment_metrics.relative_humidity == 0 || variant.environment_metrics.relative_humidity == null)
+    if (!measurement->variant.environment_metrics.has_temperature && measurement->variant.environment_metrics.temperature == 0)
     {
         measurement->variant.environment_metrics.has_temperature = true;
-        measurement->variant.environment_metrics.has_relative_humidity = true;
         measurement->variant.environment_metrics.temperature = measurement->variant.environment_metrics.soil_temperature;
+    }
+
+    if (measurement->variant.environment_metrics.relative_humidity == 0 && measurement->variant.environment_metrics.has_relative_humidity)
+    {
+        measurement->variant.environment_metrics.has_relative_humidity = true;
         measurement->variant.environment_metrics.relative_humidity = measurement->variant.environment_metrics.soil_moisture;
     }