Index: firmware/App/Services/WatchdogMgmt.c
===================================================================
diff -u -rcc4f8440e8ad7fa8f2ced2467d922be7422c344c -r3db5538afb80bc12822304d698343e0325fa708e
--- firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision cc4f8440e8ad7fa8f2ced2467d922be7422c344c)
+++ firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 3db5538afb80bc12822304d698343e0325fa708e)
@@ -184,11 +184,15 @@
                     watchdogSelfTestStatus = SELF_TEST_STATUS_FAILED;
                 }
                 // Verify backup alarm audio is on when w.d. expired
-                else if ( ( audioCurrent < MIN_BACKUP_ALARM_CURRENT_MA ) &&
-                        ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_ALARM_AUDIO ) != SW_CONFIG_ENABLE_VALUE ) )
+                else if ( audioCurrent < MIN_BACKUP_ALARM_CURRENT_MA )
                 {
-                    SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_WATCHDOG_POST_TEST_FAILED, 3.0, audioCurrent );
-                    watchdogSelfTestStatus = SELF_TEST_STATUS_FAILED;
+#ifndef _RELEASE_
+                    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_ALARM_AUDIO ) != SW_CONFIG_ENABLE_VALUE )
+#endif
+                    {
+                        SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_WATCHDOG_POST_TEST_FAILED, 3.0, audioCurrent );
+                        watchdogSelfTestStatus = SELF_TEST_STATUS_FAILED;
+                    }
                 }
             }
             else
@@ -215,11 +219,15 @@
                         watchdogSelfTestStatus = SELF_TEST_STATUS_FAILED;
                     }
                     // Verify backup alarm audio is on when w.d. recovered
-                    else if ( ( audioCurrent > MAX_BACKUP_ALARM_CURRENT_MA ) &&
-                              ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_ALARM_AUDIO ) != SW_CONFIG_ENABLE_VALUE ) )
+                    else if ( audioCurrent > MAX_BACKUP_ALARM_CURRENT_MA )
                     {
-                        SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_WATCHDOG_POST_TEST_FAILED, 5.0, audioCurrent );
-                        watchdogSelfTestStatus = SELF_TEST_STATUS_FAILED;
+#ifndef _RELEASE_
+                        if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_ALARM_AUDIO ) != SW_CONFIG_ENABLE_VALUE )
+#endif
+                        {
+                            SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_WATCHDOG_POST_TEST_FAILED, 5.0, audioCurrent );
+                            watchdogSelfTestStatus = SELF_TEST_STATUS_FAILED;
+                        }
                     }
                     else
                     {