Index: firmware/App/Modes/ModeGenDialysate.c
===================================================================
diff -u -rc804832f7c982e331bf18a239e6815acf915c4c3 -re93982d9a054c7a5988c24f98d79d8e0cfaf480c
--- firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision c804832f7c982e331bf18a239e6815acf915c4c3)
+++ firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision e93982d9a054c7a5988c24f98d79d8e0cfaf480c)
@@ -7,8 +7,8 @@
 *
 * @file    ModeGenDialysate.c
 *
-* @author  (last)      Varshini Nagabooshanam
-* @date    (last)      12-Jan-2026
+* @author  (last)      “rkallala”
+* @date    (last)      27-Jan-2026
 *
 * @author  (original)  Vinayakam Mani
 * @date    (original)  06-Nov-2024
@@ -597,15 +597,16 @@
         execBalancingChamberControl();
     }
 
-#ifdef __SPENT_CHAMBER_FILL__
-    if ( ( TRUE == pendingSpentChamberFill ) && ( FALSE == balancingChambFillInProgress ) )
+    if ( getTestConfigStatus( TEST_CONFIG_DD_ENABLE_SPENT_CHAMBER_H_FILL ) == TRUE )
     {
-        setModeGenDStateTransition( DD_GEND_SPENT_CHAMBER_FILL_STATE );
-        pendingSpentChamberFill = FALSE;
-        isDialDeliveryInProgress.data = FALSE;
-        state = DD_GEND_SPENT_CHAMBER_FILL_STATE;
+        if ( ( TRUE == pendingSpentChamberFill ) && ( FALSE == balancingChambFillInProgress ) )
+        {
+            setModeGenDStateTransition( DD_GEND_SPENT_CHAMBER_FILL_STATE );
+            pendingSpentChamberFill = FALSE;
+            isDialDeliveryInProgress.data = FALSE;
+            state = DD_GEND_SPENT_CHAMBER_FILL_STATE;
+        }
     }
-#endif
 #ifdef __BICARB_CHAMBER_FILL__
     if ( ( TRUE == pendingBicarbChamberFill ) && ( FALSE == balancingChambFillInProgress ) )
     {
@@ -650,15 +651,16 @@
         isDialDeliveryInProgress.data = FALSE;
         state = DD_GEND_DIALYSATE_BYPASS_STATE;
     }
-#ifdef __SPENT_CHAMBER_FILL__
-    else if ( ( TRUE == pendingSpentChamberFill ) && ( FALSE == balancingChambFillInProgress ) )
+    else if ( getTestConfigStatus( TEST_CONFIG_DD_ENABLE_SPENT_CHAMBER_H_FILL ) == TRUE )
     {
-        setModeGenDStateTransition( DD_GEND_SPENT_CHAMBER_FILL_STATE );
-        pendingSpentChamberFill = FALSE;
-        isDialDeliveryInProgress.data = FALSE;
-        state = DD_GEND_SPENT_CHAMBER_FILL_STATE;
+        if ( ( TRUE == pendingSpentChamberFill ) && ( FALSE == balancingChambFillInProgress ) )
+        {
+            setModeGenDStateTransition( DD_GEND_SPENT_CHAMBER_FILL_STATE );
+            pendingSpentChamberFill = FALSE;
+            isDialDeliveryInProgress.data = FALSE;
+            state = DD_GEND_SPENT_CHAMBER_FILL_STATE;
+        }
     }
-#endif
 #ifdef __BICARB_CHAMBER_FILL__
     else if ( ( TRUE == pendingBicarbChamberFill ) && ( FALSE == balancingChambFillInProgress ) )
     {