Index: firmware/App/Controllers/DGInterface.c
===================================================================
diff -u -r2112e3143003eaf9584d4be068f7ca89b33c941a -r4b22b45e775c0525bc1d76e83e265af91a59785e
--- firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 2112e3143003eaf9584d4be068f7ca89b33c941a)
+++ firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 4b22b45e775c0525bc1d76e83e265af91a59785e)
@@ -18,6 +18,7 @@
 #include "ModeTreatment.h"
 #include "OperationModes.h"
 #include "SystemCommMessages.h"
+#include "Timers.h"
 #include "DGInterface.h"
 
 /**
@@ -33,7 +34,7 @@
 #define DRAIN_RESERVOIR_TO_VOLUME_ML        200 //100                 ///< Drain reservoir to this volume (in mL) during treatment.
 #define FILL_RESERVOIR_TO_VOLUME_ML         1500                ///< Fill reservoir to this volume (in mL) during treatment.
 
-#define RESERVOIR_SETTLE_TIME_MS            3000                ///< Time (in ms) allotted for reservoir to settle (after fill, before drain).
+#define RESERVOIR_SETTLE_TIME_MS            5000                ///< Time (in ms) allotted for reservoir to settle (after fill, before drain).
 
 /// States of the treatment reservoir management state machine.
 typedef enum TreatmentReservoirMgmt_States
@@ -176,7 +177,7 @@
             break;
 
         case TREATMENT_RESERVOIR_MGMT_FILL_RESERVOIR_STATE:
-            if ( DG_MODE_CIRC == dgOpMode )
+            if ( ( DG_MODE_CIRC == dgOpMode ) && ( DG_RECIRCULATE_MODE_STATE_RECIRC_WATER == getDGSubMode() ) )
             {
                 resMgmtTimer = getMSTimerCount();
                 currentTrtResMgmtState = TREATMENT_RESERVOIR_MGMT_WAIT_FOR_FILL_SETTLE_STATE;