Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -r27a68f930508638f2eb6265ebb381c8918cbc37b -rd3238fdff8cf77b3b2fbd79c6deeed3f9d4a30ae
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 27a68f930508638f2eb6265ebb381c8918cbc37b)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision d3238fdff8cf77b3b2fbd79c6deeed3f9d4a30ae)
@@ -247,7 +247,9 @@
     if ( ( alarm > ALARM_ID_NO_ALARM ) && ( alarm < NUM_OF_ALARM_IDS ) )
     {
         // No need to do anything if alarm is already active
-        if ( FALSE == alarmIsActive[ alarm ] )
+        if ( ( FALSE == alarmIsActive[ alarm ] ) ||
+           ( ( FALSE == alarmIsDetected[ alarm ] ) &&   // someone cleared the condition
+             ( FALSE == ALARM_TABLE[ alarm ].alarmConditionClearImmed ) ) ) // it is not cleared immediate
         {
             // If alarm status was that no alarms currently active, set this alarm as top alarm until status formally updated later
             if ( ALARM_ID_NO_ALARM == alarmStatus.alarmTop )