Index: firmware/App/Modes/ModeChemicalDisinfectFlush.c
===================================================================
diff -u -r5109bb981cab2025fcb9de33e303d046085efa18 -r713052663335c4402f29a87853802c1b7db0d583
--- firmware/App/Modes/ModeChemicalDisinfectFlush.c	(.../ModeChemicalDisinfectFlush.c)	(revision 5109bb981cab2025fcb9de33e303d046085efa18)
+++ firmware/App/Modes/ModeChemicalDisinfectFlush.c	(.../ModeChemicalDisinfectFlush.c)	(revision 713052663335c4402f29a87853802c1b7db0d583)
@@ -365,14 +365,21 @@
 
     if ( FALSE == isAlarmActive( ALARM_ID_DG_CHEM_DISINFECT_FLUSH_REMOVE_ACID ) )
     {
-        // Close VPi to prevent wasting water
-        setValveState( VPI, VALVE_STATE_CLOSED );
-        setValveState( VPO, VALVE_STATE_FILL_C_TO_NC );
-        setValveState( VRD1, VALVE_STATE_OPEN );
-        setDrainPumpTargetRPM( DRAIN_PUMP_TARGET_RPM );
-        rsrvr1Status = DG_RESERVOIR_ABOVE_TARGET;
-        stateTimer   = getMSTimerCount();
-        state        = DG_CHEM_DISINFECT_FLUSH_STATE_DRAIN_R1;
+        if ( ( STATE_OPEN == getSwitchStatus( CONCENTRATE_CAP ) ) || ( STATE_OPEN == getSwitchStatus( DIALYSATE_CAP ) ) )
+        {
+            activateAlarmNoData( ALARM_ID_DG_CHEM_DISINFECT_FLUSH_REMOVE_ACID );
+        }
+        else
+        {
+            // Close VPi to prevent wasting water
+            setValveState( VPI, VALVE_STATE_CLOSED );
+            setValveState( VPO, VALVE_STATE_FILL_C_TO_NC );
+            setValveState( VRD1, VALVE_STATE_OPEN );
+            setDrainPumpTargetRPM( DRAIN_PUMP_TARGET_RPM );
+            rsrvr1Status = DG_RESERVOIR_ABOVE_TARGET;
+            stateTimer   = getMSTimerCount();
+            state        = DG_CHEM_DISINFECT_FLUSH_STATE_DRAIN_R1;
+        }
     }
 
     return state;