Index: firmware/App/Modes/TreatmentStop.c
===================================================================
diff -u -rac6532c81f2a6d4ad1c67420c22d59f6aeeaae13 -rb5accb82ac043938255883b6c60a6f81795569b0
--- firmware/App/Modes/TreatmentStop.c	(.../TreatmentStop.c)	(revision ac6532c81f2a6d4ad1c67420c22d59f6aeeaae13)
+++ firmware/App/Modes/TreatmentStop.c	(.../TreatmentStop.c)	(revision b5accb82ac043938255883b6c60a6f81795569b0)
@@ -79,7 +79,14 @@
 {
     // Set user alarm recovery actions allowed in this sub-mode
     setAlarmUserActionEnabled( ALARM_USER_ACTION_RESUME, TRUE );
-    setAlarmUserActionEnabled( ALARM_USER_ACTION_RINSEBACK, TRUE );
+    if ( TRUE == getRinsebackCompleted() )
+    {   // block rinseback action if already done
+        setAlarmUserActionEnabled( ALARM_USER_ACTION_RINSEBACK, FALSE );
+    }
+    else
+    {
+        setAlarmUserActionEnabled( ALARM_USER_ACTION_RINSEBACK, TRUE );
+    }
     setAlarmUserActionEnabled( ALARM_USER_ACTION_END_TREATMENT, TRUE );
 
     // Ensure all pumps except DPi stopped
@@ -104,9 +111,9 @@
     // Should always have an alarm active in treatment stop sub-mode so that user can take action
     if ( FALSE == isAnyAlarmActive() )
     {
-        if ( FALSE == getRinsebackCompleted() )
+        if ( TRUE == getRinsebackCompleted() )
         {
-            activateAlarmNoData( ALARM_ID_TREATMENT_STOPPED_AFTER_RINSEBACK );
+            activateAlarmNoData( ALARM_ID_TREATMENT_STOPPED_AFTER_RINSEBACK );  // No escalation after rinseback because no blood in blood line
         }
         else
         {
@@ -115,18 +122,6 @@
         // coming back to stop state via non-alarm path, so no audio - just want alarm for its options
         signalAlarmSilence( ALARM_SILENCE_CMD_CANCEL );
     }
-
-    // Set user alarm recovery actions allowed in this sub-mode
-    setAlarmUserActionEnabled( ALARM_USER_ACTION_RESUME, TRUE );
-    if ( TRUE == getRinsebackCompleted() )
-    {   // block rinseback action if already done
-        setAlarmUserActionEnabled( ALARM_USER_ACTION_RINSEBACK, FALSE );
-    }
-    else
-    {
-        setAlarmUserActionEnabled( ALARM_USER_ACTION_RINSEBACK, TRUE );
-    }
-    setAlarmUserActionEnabled( ALARM_USER_ACTION_END_TREATMENT, TRUE );
 }
 
 /*********************************************************************//**