Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r08e5bebcd5947c30e8d9176211b16f822dfe475c -r1afa4c22ab3d44f71eace94e83ad1616a47407d2
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 08e5bebcd5947c30e8d9176211b16f822dfe475c)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 1afa4c22ab3d44f71eace94e83ad1616a47407d2)
@@ -1163,19 +1163,6 @@
     {
         state = PRE_TREATMENT_RESERVOIR_MGMT_REQUEST_RESERVOIR_SWITCH_STATE;
 
-        // Start tracking flush cycles, flushComplete => don't drain again, this completes the final fill.
-        if ( FALSE == reservoirStatus[ inactiveReservoir ].flushComplete )
-        {
-            if ( reservoirStatus[ inactiveReservoir ].flushCount > 0 )
-            {
-                reservoirStatus[ inactiveReservoir ].flushCount -= 1;
-            }
-            if ( 0 == reservoirStatus[ inactiveReservoir ].flushCount )
-            {
-                reservoirStatus[ inactiveReservoir ].flushComplete = TRUE;
-            }
-        }
-
         if ( ( TRUE == reservoirStatus[ DG_RESERVOIR_1 ].flushComplete ) &&
              ( TRUE == reservoirStatus[ DG_RESERVOIR_2 ].flushComplete ) )
         {
@@ -1187,13 +1174,18 @@
                    state = PRE_TREATMENT_RESERVOIR_MGMT_COMPLETE_STATE;
                }
         }
-        else
-        {
-            DG_SWITCH_RSRVRS_CMD_T rsrvrCmd;
 
-            rsrvrCmd.reservoirID                     = activeReservoir;
-            rsrvrCmd.useLastTrimmerHeaterDC          = FALSE;
-            cmdSetDGActiveReservoir( &rsrvrCmd );
+        // Start tracking flush cycles, flushComplete => don't drain again, this completes the final fill.
+        if ( FALSE == reservoirStatus[ inactiveReservoir ].flushComplete )
+        {
+            if ( reservoirStatus[ inactiveReservoir ].flushCount > 0 )
+            {
+                reservoirStatus[ inactiveReservoir ].flushCount -= 1;
+            }
+            if ( 0 == reservoirStatus[ inactiveReservoir ].flushCount )
+            {
+                reservoirStatus[ inactiveReservoir ].flushComplete = TRUE;
+            }
         }
     }