Index: firmware/App/Modes/TreatmentStop.c
===================================================================
diff -u -rfa356a2bce909141f45c6832659fa1ceea5bfbba -r49dba1e95bb3763b4c150e7a80b84a65264a7ca8
--- firmware/App/Modes/TreatmentStop.c	(.../TreatmentStop.c)	(revision fa356a2bce909141f45c6832659fa1ceea5bfbba)
+++ firmware/App/Modes/TreatmentStop.c	(.../TreatmentStop.c)	(revision 49dba1e95bb3763b4c150e7a80b84a65264a7ca8)
@@ -62,10 +62,18 @@
     resetSalineBolus();
     // Stop air trap control
     endAirTrapControl();
-    // Should always have stopped alarm active in treatment stop sub-mode so that user can take action
-    if ( FALSE == isAlarmActive( ALARM_ID_TREATMENT_STOPPED_BY_USER ) )
+    // Should always have an alarm active in treatment stop sub-mode so that user can take action
+    if ( FALSE == isAnyAlarmActive() )
     {
-        activateAlarmNoData( ALARM_ID_TREATMENT_STOPPED_BY_USER );
+        if ( FALSE == getRinsebackCompleted() )
+        {
+            activateAlarmNoData( ALARM_ID_TREATMENT_STOPPED_AFTER_RINSEBACK );
+        }
+        else
+        {
+            activateAlarmNoData( ALARM_ID_TREATMENT_STOPPED_BY_USER );
+        }
+        // coming back to stop state via non-alarm path, so no audio - just want alarm for its options
         signalAlarmSilence( ALARM_SILENCE_CMD_CANCEL );
     }