Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -r12708a04ae3365e11180182fc52d005c229a7bc6 -rfa1a1b4206b3a917f93262bea47140a8a7d1afe3
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 12708a04ae3365e11180182fc52d005c229a7bc6)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision fa1a1b4206b3a917f93262bea47140a8a7d1afe3)
@@ -1246,8 +1246,8 @@
     // which will cause a fault
     for ( a = ( ( ALARM_ID_T ) 1 ) ; a < NUM_OF_ALARM_IDS; a++ )
     {
-        // Is alarm recoverable?
-        if ( FALSE == ALARM_TABLE[ a ].alarmNoClear )
+        // Clear alarm if alarm allowed to be cleared and not clear only (those are cleared individually)
+        if ( ( FALSE == ALARM_TABLE[ a ].alarmNoClear ) && ( FALSE == ALARM_TABLE[ a ].alarmClearOnly ) )
         {
             clearAlarm( a );
         }