Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -r5072f7dedbe4be9dd9d2bfe9a46f53c1d3f356fc -r4ac6a67ab2876d1f436704fe67a958e17d0b432a
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 5072f7dedbe4be9dd9d2bfe9a46f53c1d3f356fc)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 4ac6a67ab2876d1f436704fe67a958e17d0b432a)
@@ -431,8 +431,7 @@
     broadcastTreatmentTimeAndState();
     broadcastTreatmentSettingsRanges();
 
-    // Call various execs for treatment mode
-    execTreatmentReservoirMgmt();
+    // Manage air trap control
     execAirTrapMonitorTreatment();
 
     return currentTreatmentState;
@@ -493,6 +492,7 @@
         // Handle signals from blood prime sub-mode
         if ( TRUE == bloodPrimeToDialysisRequest )
         {
+            lastTreatmentTimeStamp = getMSTimerCount();
             // Kick dialysis sub-mode off
             setDialysisParams( presBloodFlowRate, presDialysateFlowRate, presMaxUFVolumeML, presUFRate );
             transitionToDialysis();
@@ -546,6 +546,7 @@
         // Otherwise, execute state machine for treatment dialysis sub-mode
         else
         {
+            execTreatmentReservoirMgmt();
             execDialysis();
         }
     }