Index: firmware/App/Services/WatchdogMgmt.c
===================================================================
diff -u -r25ede6f944eb53b68c8073404663c99d3ce158b0 -r8b7624b617afc9f51297c0b5f896b98d02f12830
--- firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 25ede6f944eb53b68c8073404663c99d3ce158b0)
+++ firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 8b7624b617afc9f51297c0b5f896b98d02f12830)
@@ -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 );