Index: firmware/App/Controllers/Temperatures.c
===================================================================
diff -u -rf6b78d1fe6741043de38707211710ab0e8a08483 -rbcd401a6b62f71334102bf638e8c85e502d90b96
--- firmware/App/Controllers/Temperatures.c	(.../Temperatures.c)	(revision f6b78d1fe6741043de38707211710ab0e8a08483)
+++ firmware/App/Controllers/Temperatures.c	(.../Temperatures.c)	(revision bcd401a6b62f71334102bf638e8c85e502d90b96)
@@ -368,18 +368,17 @@
             case TEMPSENSOR_PBA_ADC_SENSOR:
 
 #ifndef _RELEASE_
-                // If the software configuration is not enable to read the DVT arterial pressure, set the temperature to 30 to make sure
+                // If the software configuration is not enabled to read the DVT arterial pressure, set the temperature to 30 to make sure
                 // there is no temperature error because the sensor is not available. The old arterial sensor did not have a temperature sensor
                 // inside it. NOTE: this line of code should be remove later.
-                temperature = 30.0;
-
                 if (  getSoftwareConfigStatus( SW_CONFIG_ENABLE_DVT_ARTERIAL_PRESSURE_SENSOR ) != SW_CONFIG_ENABLE_VALUE )
 #endif
                 {
                     // Temperature (C) = ((ADC - 0x800000) / 13584) - 272.5
                     temperature = ( ( rawADC - ADC_BOARD_TEMP_SENSOR_CONVERSION_CONST_2 ) * ADC_BOARD_TEMP_SENSOR_CONVERSION_COEFF ) -
                                       ADC_BOARD_TEMP_SENSOR_CONVERSION_CONST_1;
                 }
+                temperature = 30.0; // PBA_ADC temperature sensor has been remove from all of the devices. Remove the feature in DEN-12224.
                 break;
 
             case TEMPSENSOR_ARTERIAL_PRESSURE_SENSOR: