Index: firmware/App/Modes/TreatmentStop.c
===================================================================
diff -u -rd70681aa147f2b4b888e130bd09cb81db5de25a3 -r6624b2257367f346202eeca3024ef2aae44e4c96
--- firmware/App/Modes/TreatmentStop.c	(.../TreatmentStop.c)	(revision d70681aa147f2b4b888e130bd09cb81db5de25a3)
+++ firmware/App/Modes/TreatmentStop.c	(.../TreatmentStop.c)	(revision 6624b2257367f346202eeca3024ef2aae44e4c96)
@@ -109,6 +109,8 @@
 
     setupForDialysateRecirculationState();
 
+    signalUserRateChange();  // so pressure limits re-stabilize
+
     // Reset saline bolus state in case alarm interrupted one
     resetSalineBolus();
 
@@ -450,7 +452,9 @@
         data.timeout   = 0;
         data.countdown = 0;
 
-        if ( ( getRinsebackCompleted() != TRUE ) && ( isAlarmActive( ALARM_ID_HD_TREATMENT_RINSEBACK_TIMEOUT_ALARM ) != TRUE ) )
+        if ( ( getRinsebackCompleted() != TRUE ) &&
+             ( isAlarmActive( ALARM_ID_HD_TREATMENT_RINSEBACK_TIMEOUT_ALARM ) != TRUE ) &&
+             ( isAlarmActive( ALARM_ID_HD_TREATMENT_STOPPED_NO_RINSEBACK ) != TRUE ) )
         {
             if ( bloodSittingTimerCtr > 0 )
             {