Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -red6e1e131ccb7a9a586cfb766ea270fc3cbdc1c9 -r8ec997d92b561aa3763f751302693bd432540f3e
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision ed6e1e131ccb7a9a586cfb766ea270fc3cbdc1c9)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 8ec997d92b561aa3763f751302693bd432540f3e)
@@ -239,7 +239,7 @@
     BOOL result = FALSE;
     REQUEST_REJECT_REASON_CODE_T rejReason = REQUEST_REJECT_REASON_NONE;
 
-    if ( TRUE != getAllowNewTreatmentStatus() )
+    if ( TRUE == getNoNewTreatmentStatus() )
     {
         rejReason = REQUEST_REJECT_REASON_NO_NEW_TREATMENT_ALARM_TRIGGERED;
     }
Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -r050cc33f4556e1a6b928ea90f6d95387505df73d -r8ec997d92b561aa3763f751302693bd432540f3e
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 050cc33f4556e1a6b928ea90f6d95387505df73d)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 8ec997d92b561aa3763f751302693bd432540f3e)
@@ -76,7 +76,6 @@
 
 static U32 alarmAudioVolumeLevel = 3; //MIN_ALARM_VOLUME_ATTENUATION;               ///< Set alarm audio volume attenuation level (0..4 - lower level = higher gain).
 static U32 alarmStatusPublicationTimerCounter = 0;                                  ///< Used to schedule alarm status publication to CAN bus.
-static BOOL allowNewTreatment = TRUE;                                               ///< Allow new treatment persistent flag.
 
 // ********** private function prototypes **********
 
@@ -144,8 +143,6 @@
     alarmStatus.noNewTreatment = FALSE;
     alarmStatus.noDialRecirc = FALSE;
     alarmStatus.usrACKRequired = FALSE;
-
-    allowNewTreatment = TRUE;
 }
 
 /*********************************************************************//**
@@ -568,15 +565,15 @@
 
 /*********************************************************************//**
  * @brief
-* The getAllowNewTreatmentStatus function gets the persistent allow new
-* treatment status flag.
-* @details Inputs: allowNewTreatment
+* The getNoNewTreatmentStatus function gets the persistent no new
+* treatment alarm status flag.
+* @details Inputs: alarmStatus.noNewTreatment
 * @details Outputs: none
-* @return allowNewTreatment
+* @return TRUE if no new treatment allowed, otherwise FALSE
 *************************************************************************/
-BOOL getAllowNewTreatmentStatus( void )
+BOOL getNoNewTreatmentStatus( void )
 {
-    return allowNewTreatment;
+    return alarmStatus.noNewTreatment;
 }
 
 /*********************************************************************//**
@@ -974,19 +971,14 @@
         noEndTreatment = TRUE;
     }
 
-    if ( TRUE == noNewTreatment )
-    {
-        allowNewTreatment = FALSE;
-    }
-
     // Set updated alarm flags
     alarmStatus.systemFault = systemFault;
     alarmStatus.stop = stop;
     alarmStatus.noClear = noClear;
     alarmStatus.noResume = noResume;
     alarmStatus.noRinseback = noRinseback;
     alarmStatus.noEndTreatment = noEndTreatment;
-    alarmStatus.noNewTreatment = noNewTreatment;
+    alarmStatus.noNewTreatment |= noNewTreatment;
     alarmStatus.usrACKRequired = usrAckReq;
 }
 
Index: firmware/App/Services/AlarmMgmt.h
===================================================================
diff -u -red6e1e131ccb7a9a586cfb766ea270fc3cbdc1c9 -r8ec997d92b561aa3763f751302693bd432540f3e
--- firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision ed6e1e131ccb7a9a586cfb766ea270fc3cbdc1c9)
+++ firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision 8ec997d92b561aa3763f751302693bd432540f3e)
@@ -151,7 +151,7 @@
 BOOL isAlarmRecoverable( ALARM_ID_T alarm );
 void setAlarmAudioVolume( U32 volumeLevel );
 
-BOOL getAllowNewTreatmentStatus( void );
+BOOL getNoNewTreatmentStatus( void );
 void handleActiveAlarmListRequest( void );
 
 BOOL testSetAlarmStateOverride( U32 alarmID, BOOL value );