Index: firmware/App/Modes/Prime.c
===================================================================
diff -u -rb8d74fc5b07d0e62d841b4c5a786b2be4e593c63 -rba7a576375ad7bbfa0d5a879d82b8783e5182899
--- firmware/App/Modes/Prime.c	(.../Prime.c)	(revision b8d74fc5b07d0e62d841b4c5a786b2be4e593c63)
+++ firmware/App/Modes/Prime.c	(.../Prime.c)	(revision ba7a576375ad7bbfa0d5a879d82b8783e5182899)
@@ -479,24 +479,29 @@
 
     if ( TRUE == getReservoirFillStatus( DG_RESERVOIR_1 ) )
     {
-        setValvePosition( VDI, VALVE_POSITION_B_OPEN );
-        setValvePosition( VDO, VALVE_POSITION_B_OPEN );
-        setValvePosition( VBA, VALVE_POSITION_C_CLOSE );
-        setValvePosition( VBV, VALVE_POSITION_C_CLOSE );
-        setValveAirTrap( STATE_CLOSED );
+        cmdSetDGActiveReservoir( DG_RESERVOIR_1 );
 
-        setDialInPumpTargetFlowRate( DIALYSATE_PUMP_PRIME_FLOW_RATE, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
-        setDialOutPumpTargetRate( DIALYSATE_PUMP_PRIME_FLOW_RATE, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
+        if ( TRUE == hasDGCompletedReservoirSwitch() )
+        {
+            setValvePosition( VDI, VALVE_POSITION_B_OPEN );
+            setValvePosition( VDO, VALVE_POSITION_B_OPEN );
+            setValvePosition( VBA, VALVE_POSITION_C_CLOSE );
+            setValvePosition( VBV, VALVE_POSITION_C_CLOSE );
+            setValveAirTrap( STATE_CLOSED );
 
-        previousLoadCellReading = 0;
-        loadcellSteadyVolumeStartTime = getMSTimerCount();
-        primeDialysateDialyzerStartTime = getMSTimerCount();
+            setDialInPumpTargetFlowRate( DIALYSATE_PUMP_PRIME_FLOW_RATE, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
+            setDialOutPumpTargetRate( DIALYSATE_PUMP_PRIME_FLOW_RATE, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
 
-#ifdef SKIP_PRIMING
-        state = HD_PRIME_WET_SELF_TESTS_STATE;
-#else
-        state = HD_PRIME_DIALYSATE_DIALYZER_STATE;
-#endif
+            previousLoadCellReading = 0;
+            loadcellSteadyVolumeStartTime = getMSTimerCount();
+            primeDialysateDialyzerStartTime = getMSTimerCount();
+
+    #ifdef SKIP_PRIMING
+            state = HD_PRIME_WET_SELF_TESTS_STATE;
+    #else
+            state = HD_PRIME_DIALYSATE_DIALYZER_STATE;
+    #endif
+        }
     }
 
     if ( TRUE == doesAlarmStatusIndicateStop() )
@@ -564,19 +569,24 @@
 
     if ( TRUE == getReservoirFillStatus( DG_RESERVOIR_2 ) )
     {
-        signalDialOutPumpHardStop();
-        setDialInPumpTargetFlowRate( DIALYSATE_PUMP_PRIME_FLOW_RATE, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
+        cmdSetDGActiveReservoir( DG_RESERVOIR_2 );
 
-        setValvePosition( VDI, VALVE_POSITION_C_CLOSE );
-        setValvePosition( VDO, VALVE_POSITION_C_CLOSE );
-        setValvePosition( VBA, VALVE_POSITION_C_CLOSE );
-        setValvePosition( VBV, VALVE_POSITION_C_CLOSE );
-        setValveAirTrap( STATE_CLOSED );
+        if ( TRUE == hasDGCompletedReservoirSwitch() )
+        {
+            signalDialOutPumpHardStop();
+            setDialInPumpTargetFlowRate( DIALYSATE_PUMP_PRIME_FLOW_RATE, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
 
-        previousLoadCellReading = 0;
-        primeDialysateBypassStartTime = getMSTimerCount();
-        loadcellSteadyVolumeStartTime = getMSTimerCount();
-        state = HD_PRIME_DIALYSATE_BYPASS_STATE;
+            setValvePosition( VDI, VALVE_POSITION_C_CLOSE );
+            setValvePosition( VDO, VALVE_POSITION_C_CLOSE );
+            setValvePosition( VBA, VALVE_POSITION_C_CLOSE );
+            setValvePosition( VBV, VALVE_POSITION_C_CLOSE );
+            setValveAirTrap( STATE_CLOSED );
+
+            previousLoadCellReading = 0;
+            primeDialysateBypassStartTime = getMSTimerCount();
+            loadcellSteadyVolumeStartTime = getMSTimerCount();
+            state = HD_PRIME_DIALYSATE_BYPASS_STATE;
+        }
     }
 
     if ( TRUE == doesAlarmStatusIndicateStop() )