Index: firmware/App/Controllers/RinsePump.c
===================================================================
diff -u -r99e5d1b4d1e3627576d680318887ac23cd1f34ce -ra7af93efacb700dc80504906356851e9991ba3b1
--- firmware/App/Controllers/RinsePump.c	(.../RinsePump.c)	(revision 99e5d1b4d1e3627576d680318887ac23cd1f34ce)
+++ firmware/App/Controllers/RinsePump.c	(.../RinsePump.c)	(revision a7af93efacb700dc80504906356851e9991ba3b1)
@@ -7,8 +7,8 @@
 *
 * @file    RinsePump.c
 *
-* @author  (last)      Jashwant Gantyada
-* @date    (last)      02-Apr-2026
+* @author  (last)      Vinayakam Mani
+* @date    (last)      14-Apr-2026
 *
 * @author  (original)  Vinayakam Mani
 * @date    (original)  02-Oct-2025
@@ -79,7 +79,7 @@
 {
     // Initialize controller variables
     rinsePumpDataPublicationTimerCounter    = DATA_PUBLISH_COUNTER_START_COUNT;
-    currentRinsePumpState                   = RINSE_PUMP_STATE_INIT;
+    currentRinsePumpState                   = RINSE_PUMP_STATE_OFF;
     rinsePumpDataPublishInterval.data       = RINSE_PUMP_DATA_PUB_INTERVAL;
     rinsePumpDataPublishInterval.ovData     = RINSE_PUMP_DATA_PUB_INTERVAL;
     rinsePumpDataPublishInterval.ovInitData = RINSE_PUMP_DATA_PUB_INTERVAL;
@@ -274,15 +274,15 @@
 
     rinsePumpTargetSpeedRPM = 0;
 
-    if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) )
+    if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) )
     {
-        // Set PWM count zero to stop the logical rinse pump
-        setRinsePumpPwmCount( D79_RINSE_PUMP, RINSE_PUMP_OFF_COUNT );
+        // Current Beta 1.9 system uses on/off bit
+        setValveState( D88_79_VALV, VALVE_STATE_CLOSED );
     }
     else
     {
-        // Current Beta 1.9 system uses on/off bit
-        setValveState( D88_79_VALV, VALVE_STATE_CLOSED );
+        // Set PWM count zero to stop the logical rinse pump
+        setRinsePumpPwmCount( D79_RINSE_PUMP, RINSE_PUMP_OFF_COUNT );
     }
 
     return state;
@@ -299,8 +299,13 @@
 {
     RINSE_PUMP_STATE_T state = RINSE_PUMP_STATE_ON;
 
-    if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) )
+    if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) )
     {
+        // Current Beat 1.9 system uses on/off bit
+        setValveState( D88_79_VALV, VALVE_STATE_OPEN );
+    }
+    else
+    {
         F32 pwmPercent   = getF32OverrideValue( &rinsePumpPwmPercentage );     // TODO should this conversion happen in setPWMCount function?
         U32 pwmInCount   = (U32)( ( pwmPercent / RINSE_PUMP_MAX_PWM_PERCENT ) * RINSE_PUMP_PWM_IN_COUNT_MAX );
 
@@ -309,11 +314,6 @@
         // Turn on logical rinse pump with given PWM value
         setRinsePumpPwmCount( D79_RINSE_PUMP, (U32)pwmInCount );
     }
-    else
-    {
-        // Current Beat 1.9 system uses on/off bit
-        setValveState( D88_79_VALV, VALVE_STATE_OPEN );
-    }
 
     return state;
 }