Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -rc7f4ad020dbbdca975001dfddb2d402baf45d1a6 -r2aeabba6bbaf35c31be651340e8ecb1889a5d9a1
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision c7f4ad020dbbdca975001dfddb2d402baf45d1a6)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 2aeabba6bbaf35c31be651340e8ecb1889a5d9a1)
@@ -1101,9 +1101,10 @@
                 state = PRE_TREATMENT_RESERVOIR_MGMT_FILL_CMD_RESP_STATE;
             }
 
-            // flushed and need to fill
+            // flushed and need to fill after entering dry self test state
             if ( ( TRUE == reservoirFlushedStatus[ inactiveReservoir ] ) &&
-                    ( TRUE == reservoirFlags[ inactiveReservoir ].startNormalFill ) )
+                    ( TRUE == reservoirFlags[ inactiveReservoir ].startNormalFill ) &&
+                    ( currentPreTreatmentState >= HD_PRE_TREATMENT_SELF_TEST_DRY_STATE ) )
             {
                 cmdStartDGFill( volume, DEFAULT_TARGET_FILL_FLOW_RATE_LPM );
                 state = PRE_TREATMENT_RESERVOIR_MGMT_FILL_CMD_RESP_STATE;
Index: firmware/App/Modes/Prime.c
===================================================================
diff -u -ra8276aeaf0877db31ebe20dffd8e60aad1ecaa9f -r2aeabba6bbaf35c31be651340e8ecb1889a5d9a1
--- firmware/App/Modes/Prime.c	(.../Prime.c)	(revision a8276aeaf0877db31ebe20dffd8e60aad1ecaa9f)
+++ firmware/App/Modes/Prime.c	(.../Prime.c)	(revision 2aeabba6bbaf35c31be651340e8ecb1889a5d9a1)
@@ -871,7 +871,7 @@
     {
         DG_SWITCH_RSRVRS_CMD_T rsrvrCmd;
 
-        rsrvrCmd.reservoirID            = (U32)DG_RESERVOIR_1;
+        rsrvrCmd.reservoirID            = (U32)DG_RESERVOIR_2;
         rsrvrCmd.useLastTrimmerHeaterDC = FALSE;
 
         cmdSetDGActiveReservoir( &rsrvrCmd );