Index: firmware/App/Drivers/SafetyShutdown.c
===================================================================
diff -u -r3115c2cfd605f3b1f9be3bb2064116b0cd15e9c7 -rd52eeaec7379650a8cf901f06d3bd8ddf5cb7f06
--- firmware/App/Drivers/SafetyShutdown.c	(.../SafetyShutdown.c)	(revision 3115c2cfd605f3b1f9be3bb2064116b0cd15e9c7)
+++ firmware/App/Drivers/SafetyShutdown.c	(.../SafetyShutdown.c)	(revision d52eeaec7379650a8cf901f06d3bd8ddf5cb7f06)
@@ -129,9 +129,8 @@
                 F32 v24         = getIntADCVoltageConverted( INT_ADC_SECONDARY_HEATER_24_VOLTS );
                 F32 isolatedV24 = getMonitoredLineLevel( MONITORED_LINE_24V_POWER_PRIM_HTR_V );
 
-
                 // Verify 24V is down when w.d. expired
-                if ( ( v24 > MAX_24V_LEVEL_ON_SAFETY_SHUTDOWN ) && ( isolatedV24 > MAX_24V_LEVEL_ON_SAFETY_SHUTDOWN ) )
+                if ( ( v24 > MAX_24V_LEVEL_ON_SAFETY_SHUTDOWN ) || ( isolatedV24 > MAX_24V_LEVEL_ON_SAFETY_SHUTDOWN ) )
                 {
                     SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DG_SAFETY_SHUTDOWN_POST_TEST_FAILED, 1.0, v24 );
                     safetyShutdownSelfTestStatus = SELF_TEST_STATUS_FAILED;
@@ -150,7 +149,7 @@
                 F32 isolatedV24 = getMonitoredLineLevel( MONITORED_LINE_24V_POWER_PRIM_HTR_V );
 
                 // Verify 24V is down when w.d. recovered
-                if ( ( v24 < MIN_24V_LEVEL_ON_SAFETY_RECOVER ) && ( isolatedV24 < MIN_24V_LEVEL_ON_SAFETY_RECOVER ) )
+                if ( ( v24 < MIN_24V_LEVEL_ON_SAFETY_RECOVER ) || ( isolatedV24 < MIN_24V_LEVEL_ON_SAFETY_RECOVER ) )
                 {
                     // TODO - If issue persisted talk with systems why 24V does not recover fully.
                     SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DG_SAFETY_SHUTDOWN_POST_TEST_FAILED, 2.0, v24 );