Index: firmware/App/Services/WatchdogMgmt.c
===================================================================
diff -u -r61716bc97ecca8af1ec560333844a8cf602eccb0 -r9e85e7ace1390d48587174a5bc6eb11d5185cea4
--- firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 61716bc97ecca8af1ec560333844a8cf602eccb0)
+++ firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 9e85e7ace1390d48587174a5bc6eb11d5185cea4)
@@ -185,7 +185,8 @@
                 }
 #ifndef DISABLE_ALARM_AUDIO
                 // Verify backup alarm audio is on when w.d. expired
-                else if ( audioCurrent < MIN_BACKUP_ALARM_CURRENT_MA )
+                else if ( ( audioCurrent < MIN_BACKUP_ALARM_CURRENT_MA ) &&
+                        ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_ALARM_AUDIO ) != SW_CONFIG_ENABLE_VALUE ) )
                 {
                     SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_WATCHDOG_POST_TEST_FAILED, 3.0, audioCurrent );
                     watchdogSelfTestStatus = SELF_TEST_STATUS_FAILED;
@@ -217,7 +218,8 @@
                     }
 #ifndef DISABLE_ALARM_AUDIO
                     // Verify backup alarm audio is on when w.d. recovered
-                    else if ( audioCurrent > MAX_BACKUP_ALARM_CURRENT_MA )
+                    else if ( ( audioCurrent > MAX_BACKUP_ALARM_CURRENT_MA ) &&
+                              ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_ALARM_AUDIO ) != SW_CONFIG_ENABLE_VALUE )
                     {
                         SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_WATCHDOG_POST_TEST_FAILED, 5.0, audioCurrent );
                         watchdogSelfTestStatus = SELF_TEST_STATUS_FAILED;