Index: firmware/App/Services/WatchdogMgmt.c
===================================================================
diff -u -rdbd9f64cc37fbae9e0a9cf30bc4a5e58ba2ea3cd -r5bdc0820beb17596b54356c0f4181d41f435b097
--- firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision dbd9f64cc37fbae9e0a9cf30bc4a5e58ba2ea3cd)
+++ firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 5bdc0820beb17596b54356c0f4181d41f435b097)
@@ -117,9 +117,8 @@
     // Check to see if watchdog has expired
     if ( PIN_SIGNAL_LOW == getCPLDWatchdogExpired() )
     {
-        // Ignore expired watchdog until after watchdog POST
-        if ( ( WATCHDOG_SELF_TEST_STATE_COMPLETE == watchdogSelfTestState ) ||
-             ( getCurrentOperationMode() != MODE_INIT ) )
+        // Ignore expired watchdog until after POST
+        if ( getCurrentOperationMode() != MODE_INIT )
         {
 #ifndef DEBUG_ENABLED
             activateAlarmNoData( ALARM_ID_HD_WATCHDOG_EXPIRED );