Index: firmware/App/HDCommon.h
===================================================================
diff -u -rf3c8ef49b4bef41b606325e3db0e053a7a72d98f -rfcd12c3aa538b90a2ae19b9202bc5d847859a545
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision f3c8ef49b4bef41b606325e3db0e053a7a72d98f)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision fcd12c3aa538b90a2ae19b9202bc5d847859a545)
@@ -80,7 +80,7 @@
 //    #define DISABLE_UI_COMM_TO_ALARM        1           // Disable UI comm timeouts
     #define DISABLE_WD_AND_SFTY_POST_TESTS  1           // Disable watchdog and safety shutdown POST tests
     #define DISABLE_ILLEGAL_AIR_TRAP_ALARM  1           // Disable illegal state for air trap alarm
-    #define SKIP_RESERVOIR_ALARMS           1           // Skip reservoir management alarms
+//    #define SKIP_RESERVOIR_ALARMS           1           // Skip reservoir management alarms
 
     // Skip Pre-Treatment and get to treatment as soon as possible
     #define SKIP_UI_INTERACTION             1           // Skip UI interaction.
Index: firmware/App/Services/Reservoirs.c
===================================================================
diff -u -rf3c8ef49b4bef41b606325e3db0e053a7a72d98f -rfcd12c3aa538b90a2ae19b9202bc5d847859a545
--- firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision f3c8ef49b4bef41b606325e3db0e053a7a72d98f)
+++ firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision fcd12c3aa538b90a2ae19b9202bc5d847859a545)
@@ -616,6 +616,9 @@
         // Signal dialysis sub-mode to capture final volume of prior reservoir after settling.
         setFinalReservoirVolume();
 
+        // Switched the active reservoir so reset the reservoir in use timer
+        timeReservoirInUseMS = getMSTimerCount();
+
         // Reset to start state to restart drain, fill, switch process.
         state = TREATMENT_RESERVOIR_MGMT_START_STATE;
     }