Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -r68115981be5fff762a3ef52340f69c28d5d3a5c4 -r11e26e4ae2985f74a950590aa255d2743006c40b
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 68115981be5fff762a3ef52340f69c28d5d3a5c4)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 11e26e4ae2985f74a950590aa255d2743006c40b)
@@ -747,7 +747,13 @@
  *************************************************************************/
 BOOL doesAlarmStatusIndicateEndTxOnly( void )
 {
-    return ( ( ( TRUE == alarmStatus.stop ) && ( TRUE == alarmStatus.noResume ) && ( ( FALSE == alarmStatus.noEndTreatment ) | ( TRUE == alarmStatus.ok ) ) ) ? TRUE : FALSE );
+    return ( ( ( TRUE == alarmStatus.noResume ) &&
+               ( TRUE == alarmStatus.noRinseback )  &&
+               ( TRUE == alarmStatus.stop ) &&
+               ( TRUE == alarmStatus.noBloodRecirc ) &&
+               ( FALSE == alarmStatus.noEndTreatment )
+             ) ? TRUE : FALSE
+           );
 }
 
 /*********************************************************************//**