Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -r0f9838d6b8606a6a9853ccb6157e4c25d70ddd02 -ra3a6cd2db3c03262d9da832753eeb77158845f28
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 0f9838d6b8606a6a9853ccb6157e4c25d70ddd02)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision a3a6cd2db3c03262d9da832753eeb77158845f28)
@@ -959,23 +959,24 @@
     else
     {
         if ( alarmStatus.alarmsState < NUM_OF_ALARM_PRIORITIES )
-#ifndef _RELEASE_
         {
-            if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_ALARM_AUDIO ) != SW_CONFIG_ENABLE_VALUE )
+#ifndef _RELEASE_
+            if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_ALARM_AUDIO ) )
             {
+                SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_AUDIO_INVALID_ALARM_STATE, alarmStatus.alarmsState )
+                setAlarmAudioState( ALARM_PRIORITY_HIGH,
+                                    ALARM_AUDIO_DIVIDER_LOOKUP_TABLE[volume][ALARM_AUDIO_VOLUME_GAIN],
+                                    ALARM_AUDIO_DIVIDER_LOOKUP_TABLE[volume][ALARM_AUDIO_VOLUME_DIVIDER] );
+            }
+
+            else
+#endif
+            {
                 setAlarmAudioState( alarmStatus.alarmsState,
                                     ALARM_AUDIO_DIVIDER_LOOKUP_TABLE[volume][ALARM_AUDIO_VOLUME_GAIN],
                                     ALARM_AUDIO_DIVIDER_LOOKUP_TABLE[volume][ALARM_AUDIO_VOLUME_DIVIDER] );
             }
         }
-        else
-#endif
-        {
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_AUDIO_INVALID_ALARM_STATE, alarmStatus.alarmsState )
-            setAlarmAudioState( ALARM_PRIORITY_HIGH,
-                                ALARM_AUDIO_DIVIDER_LOOKUP_TABLE[volume][ALARM_AUDIO_VOLUME_GAIN],
-                                ALARM_AUDIO_DIVIDER_LOOKUP_TABLE[volume][ALARM_AUDIO_VOLUME_DIVIDER] );
-        }
     }
 }