diff --git a/src/modules/Telemetry/Sensor/RAK12035VBSensor.cpp b/src/modules/Telemetry/Sensor/RAK12035VBSensor.cpp
index c0cae721c..a36655c39 100644
--- a/src/modules/Telemetry/Sensor/RAK12035VBSensor.cpp
+++ b/src/modules/Telemetry/Sensor/RAK12035VBSensor.cpp
@@ -87,6 +87,21 @@ bool RAK12035VBSensor::getMetrics(meshtastic_Telemetry *measurement)
     LOG_INFO("Successful read from sensor Temperature: %.2f, Moisture: %ld%", (double)(temp/10), moisture);
     measurement->variant.environment_metrics.soil_temperature = (float)(temp/10);
     measurement->variant.environment_metrics.soil_moisture = moisture;
+
+    LOG_INFO("Check if the original temperature and moisture (relative_humidity) are being used.. if not just use them for the soil monitoring.");
+
+    if( !measurement->variant.environment_metrics.has_temperature ){
+        LOG_INFO("Overwrite the temp metrics (not being set right now and this will allow the soil temp value to be used in the client interface).");
+        measurement->variant.environment_metrics.has_temperature = true;
+        measurement->variant.environment_metrics.temperature = (float)(temp/10);
+    }
+
+    if( !measurement->variant.environment_metrics.has_relative_humidity ){
+        LOG_INFO("Overwrite the moisture metrics (not being used for air humidity and this will allow the soil humidity to appear in the client interfaces without adjustments).");
+        measurement->variant.environment_metrics.has_relative_humidity = true;
+        measurement->variant.environment_metrics.relative_humidity = (float)moisture;
+    }
+
     return true;
 }
 #endif
\ No newline at end of file