Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -rb08c0632119b7528085ae6357f12699e95114bf6 -ra01b418f4a5fa91620befef12f1c9c359f1438a4
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision b08c0632119b7528085ae6357f12699e95114bf6)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision a01b418f4a5fa91620befef12f1c9c359f1438a4)
@@ -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;
         }
     }
@@ -1306,6 +1309,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
@@ -1316,6 +1321,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