Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -r89cc353281d4ea2fdcff196402069c3ee50d500d -r3e3babe8fca4a8c850198dfee1c228336c742750
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 89cc353281d4ea2fdcff196402069c3ee50d500d)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 3e3babe8fca4a8c850198dfee1c228336c742750)
@@ -720,7 +720,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
+           );
 }
 
 /*********************************************************************//**