Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -rce37a70179e1f40711a24d171618c97112be2d4e -rf70ddc5911bffe11fc5e670c8566164af4b6c88f
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision ce37a70179e1f40711a24d171618c97112be2d4e)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision f70ddc5911bffe11fc5e670c8566164af4b6c88f)
@@ -28,6 +28,7 @@
 #include "NVDataMgmt.h"
 #include "OperationModes.h"
 #include "PersistentAlarm.h"
+#include "PresOccl.h"
 #include "Reservoirs.h"
 #include "Rinseback.h"
 #include "RTC.h"
@@ -752,6 +753,8 @@
                 sendTreatmentLogEventData( UF_START_RESUME_EVENT, 0.0, presUFRate );
             }
             transitionToDialysis();
+            // To update partial blood pump occlusion baseline - start of treatment
+            signalBloodPumpPressureOcclBaseline();
             result = TREATMENT_DIALYSIS_STATE;
         }
     }
@@ -1304,6 +1307,8 @@
                 // Set to new rate
                 result &= setTreatmentParameterU32( TREATMENT_PARAM_BLOOD_FLOW, bloodRate );
                 setDialysisBloodPumpFlowRate( getTreatmentParameterU32( TREATMENT_PARAM_BLOOD_FLOW ) );
+                // Update partial occlusion baseline when blood flow rate changes
+                signalBloodPumpPressureOcclBaseline();
             }
 
             // Handle dialysate flow rate changes
@@ -1314,6 +1319,8 @@
                 // Set to new rate
                 result &= setTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW, dialRate );
                 setDialysisDialInFlowAndUFRate( getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW ), presMaxUFVolumeML, presUFRate );
+                // Update partial occlusion baseline when dialysate flow rate changes
+                signalBloodPumpPressureOcclBaseline();
             }
         }
         else