Index: firmware/App/Modes/ModeFlush.c
===================================================================
diff -u -r81872acd6f2ce222c6b9a9b93f65b7cd3665f28f -r87b18724c947a61e4c005947f227a6015d56cf0c
--- firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision 81872acd6f2ce222c6b9a9b93f65b7cd3665f28f)
+++ firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision 87b18724c947a61e4c005947f227a6015d56cf0c)
@@ -49,14 +49,15 @@
 #define DRAIN_WEIGHT_UNCHANGE_TIMEOUT               ( 6 * MS_PER_SECOND )                             ///< Time period of unchanged weight during draining before timeout.
 
 // Flush drain path state defines
-#define FLUSH_DRAIN_WAIT_TIME_MS                    ( 2 * MS_PER_SECOND )                             ///< Flush Drain path wait time in milliseconds. TODo it was 2 minutes
+#define FLUSH_DRAIN_WAIT_TIME_MS                    ( 2 * 60 * MS_PER_SECOND )                        ///< Flush Drain path wait time in milliseconds.
 
 // Flush dialysate state defines
 #define FLUSH_DIALYSATE_WAIT_TIME_MS                ( 60 * MS_PER_SECOND )                            ///< Flush dialysate wait time in milliseconds.
 
 // Flush concentrate straws state defines
 #define FLUSH_CONCENTRATE_STRAWS_TIME_MS            ( 3 * 60 * MS_PER_SECOND )                        ///< Flush concentrate straws wait time in milliseconds. todo was 3 minutes
 #define ACID_PUMP_SPEED_ML_PER_MIN                  -30.0F                                            ///< Acid pump speed in mL/min.
+
 // The bicarb pump is 2% faster than the acid pump to create a flow from acid to bicarb line during flush
 #define BICARB_PUMP_SPEED_ML_PER_MIN                30.6F                                             ///< Bicarb pump speed in mL/min.
 
@@ -307,6 +308,7 @@
 
     // Close VPi to prevent wasting water
     setValveState( VPI, VALVE_STATE_CLOSED );
+
     // Set the actuators to drain R1
     setValveState( VRD1, VALVE_STATE_OPEN );