Index: firmware/App/Modes/ModeGenDialysate.c
===================================================================
diff -u -reb01b53404b6d701dd413c08f2c7a54f8422732e -rd87d21f6b6f5ee30c839b8dadd038208cae4a4c5
--- firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision eb01b53404b6d701dd413c08f2c7a54f8422732e)
+++ firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision d87d21f6b6f5ee30c839b8dadd038208cae4a4c5)
@@ -7,8 +7,8 @@
 *
 * @file    ModeGenDialysate.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      18-Mar-2026
+* @author  (last)      Vinayakam Mani
+* @date    (last)      06-Apr-2026
 *
 * @author  (original)  Vinayakam Mani
 * @date    (original)  06-Nov-2024
@@ -275,7 +275,14 @@
             startHeater( D5_HEAT );
 
             //Turn on Trimmer heater
-            setHeaterTargetTemperature( D45_HEAT,  getD4AverageTemperature() );
+            if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_0_HW ) == TRUE )
+            {
+                setHeaterTargetTemperature( D45_HEAT, getD4AverageTemperature() );
+            }
+            else
+            {
+                setHeaterTargetTemperature( D45_HEAT, getD99AverageTemperature() );
+            }
             startHeater( D45_HEAT );
 
             //Testing : Enable close loop once testing is complete
@@ -317,7 +324,14 @@
             startHeater( D5_HEAT );
 
             //Turn on Trimmer heater
-            setHeaterTargetTemperature( D45_HEAT, getD4AverageTemperature() );
+            if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_0_HW ) == TRUE )
+            {
+                setHeaterTargetTemperature( D45_HEAT, getD4AverageTemperature() );
+            }
+            else
+            {
+                setHeaterTargetTemperature( D45_HEAT, getD99AverageTemperature() );
+            }
             startHeater( D45_HEAT );
 
             //setDialysatePumpTargetRPM( D12_PUMP, FRESH_DIAL_PUMP_INITIAL_RPM, FALSE );