Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -r7959a737a00d914ccea0f2f3f3a6ddcbd82d6334 -r01fdbae887bac01f6c35a9f65f13b87aef860b0d
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 7959a737a00d914ccea0f2f3f3a6ddcbd82d6334)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 01fdbae887bac01f6c35a9f65f13b87aef860b0d)
@@ -1038,7 +1038,6 @@
             presTreatmentTimeSecs = treatmentTime * SEC_PER_MIN;
             setTreatmentParameterF32( TREATMENT_PARAM_UF_VOLUME, ( presMaxUFVolumeML / (F32)ML_PER_LITER ) );
             setTreatmentParameterU32( TREATMENT_PARAM_TREATMENT_DURATION, ( presTreatmentTimeSecs / SEC_PER_MIN ) );
-            setDialysisBloodPumpFlowRate( getTreatmentParameterU32( TREATMENT_PARAM_BLOOD_FLOW ) );
             setDialysisDialInFlowAndUFRate( getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW ), presMaxUFVolumeML, presUFRate );
             signalInitiatePressureStabilization( USE_NORMAL_STABILIZATION_PERIOD );
         }
@@ -1223,8 +1222,7 @@
             presUFRate = pendingUFRateChange;
             signalInitiatePressureStabilization( USE_NORMAL_STABILIZATION_PERIOD );
         }
-        setDialysisBloodPumpFlowRate( getTreatmentParameterU32( TREATMENT_PARAM_BLOOD_FLOW ) );
-        setDialysisDialInFlowAndUFRate( getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW ), presMaxUFVolumeML, presUFRate  );
+        setDialysisDialInFlowAndUFRate( getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW ), presMaxUFVolumeML, presUFRate );
 
         // If UF paused, resume with new settings
         if ( ( TREATMENT_DIALYSIS_STATE == currentTreatmentState ) &&
@@ -1283,18 +1281,24 @@
              ( dialVolume <= MAX_DIALYSATE_VOLUME_ML ) )
         {
             result = TRUE;
-            sendTreatmentLogEventData( BLOOD_FLOW_RATE_CHANGE_EVENT, getTreatmentParameterU32( TREATMENT_PARAM_BLOOD_FLOW ), bloodRate );
-            sendTreatmentLogEventData( DIALYSATE_FLOW_RATE_CHANGE_EVENT, getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW ), dialRate );
-            // when one of the parameters change from the previous value, then allow to update new rates, otherwise ignore it.
-            if ( ( bloodRate != (U32)getTreatmentParameterU32( TREATMENT_PARAM_BLOOD_FLOW ) ) ||
-                 ( dialRate != (U32)getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW ) ) )
+            //  handle blood pump flow rate change
+            if ( bloodRate != (U32)getTreatmentParameterU32( TREATMENT_PARAM_BLOOD_FLOW ) )
             {
+                sendTreatmentLogEventData( BLOOD_FLOW_RATE_CHANGE_EVENT, getTreatmentParameterU32( TREATMENT_PARAM_BLOOD_FLOW ), bloodRate );
                 signalInitiatePressureStabilization( USE_NORMAL_STABILIZATION_PERIOD );
-                // Set to new rates
+                // Set to new rate
                 setTreatmentParameterU32( TREATMENT_PARAM_BLOOD_FLOW, bloodRate );
+                setDialysisBloodPumpFlowRate( getTreatmentParameterU32( TREATMENT_PARAM_BLOOD_FLOW ) );
+            }
+
+            // Handle dialysate flow rate changes
+            if ( dialRate != (U32)getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW ) )
+            {
+                sendTreatmentLogEventData( DIALYSATE_FLOW_RATE_CHANGE_EVENT, getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW ), dialRate );
+                signalInitiatePressureStabilization( USE_NORMAL_STABILIZATION_PERIOD );
+                // Set to new rate
                 setTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW, dialRate );
-                setDialysisParams( getTreatmentParameterU32( TREATMENT_PARAM_BLOOD_FLOW ), getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW ),
-                                   presMaxUFVolumeML, presUFRate );
+                setDialysisDialInFlowAndUFRate( getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW ), presMaxUFVolumeML, presUFRate );
             }
         }
         else