Index: firmware/App/Modes/ModeGenDialysate.c
===================================================================
diff -u -r5fd70f2b12c40b263b2fc58fe54c09b63d5cf0f4 -r2b24c0847960ee722b428f12735c432f55b8458c
--- firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision 5fd70f2b12c40b263b2fc58fe54c09b63d5cf0f4)
+++ firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision 2b24c0847960ee722b428f12735c432f55b8458c)
@@ -597,9 +597,9 @@
         execBalancingChamberControl();
     }
 
-    if ( ( TRUE == pendingSpentChamberFill ) && ( FALSE == balancingChambFillInProgress ) )
+    if ( getTestConfigStatus( TEST_CONFIG_DD_ENABLE_SPENT_CHAMBER_H_FILL ) == TRUE )
     {
-        if ( getTestConfigStatus( TEST_CONFIG_DD_ENABLE_SPENT_CHAMBER_F_FILL ) == TRUE )
+        if ( ( TRUE == pendingSpentChamberFill ) && ( FALSE == balancingChambFillInProgress ) )
         {
             setModeGenDStateTransition( DD_GEND_SPENT_CHAMBER_FILL_STATE );
             pendingSpentChamberFill = FALSE;
@@ -651,9 +651,9 @@
         isDialDeliveryInProgress.data = FALSE;
         state = DD_GEND_DIALYSATE_BYPASS_STATE;
     }
-    else if ( ( TRUE == pendingSpentChamberFill ) && ( FALSE == balancingChambFillInProgress ) )
+    else if ( getTestConfigStatus( TEST_CONFIG_DD_ENABLE_SPENT_CHAMBER_H_FILL ) == TRUE )
     {
-        if ( getTestConfigStatus( TEST_CONFIG_DD_ENABLE_SPENT_CHAMBER_F_FILL ) == TRUE )
+        if ( ( TRUE == pendingSpentChamberFill ) && ( FALSE == balancingChambFillInProgress ) )
         {
             setModeGenDStateTransition( DD_GEND_SPENT_CHAMBER_FILL_STATE );
             pendingSpentChamberFill = FALSE;