Index: firmware/App/Drivers/SafetyShutdown.c
===================================================================
diff -u -rb766ff89da93aeb7f423a61487933477ff3ec82d -r31f5b77ccd433ae24243a30699496cdb9c630f0f
--- firmware/App/Drivers/SafetyShutdown.c	(.../SafetyShutdown.c)	(revision b766ff89da93aeb7f423a61487933477ff3ec82d)
+++ firmware/App/Drivers/SafetyShutdown.c	(.../SafetyShutdown.c)	(revision 31f5b77ccd433ae24243a30699496cdb9c630f0f)
@@ -128,10 +128,10 @@
             if ( TRUE == didTimeout( safetyShutdownSelfTestTimerCount, SAFETY_SHUTDOWN_POST_TIMEOUT_MS ) )
             {
                 F32 v24         = getIntADCVoltageConverted( INT_ADC_SECONDARY_HEATER_24_VOLTS );
-                F32 isolatedV24 = getMonitoredLineLevel( MONITORED_LINE_24V_POWER_PRIM_HTR_V );
+                F32 isolatedV24 = getRawIsolatedPowerSupplyVoltage();
 
                 // Verify 24V is down when w.d. expired
-                if ( v24 > MAX_24V_LEVEL_ON_SAFETY_SHUTDOWN )
+                if ( ( v24 > MAX_24V_LEVEL_ON_SAFETY_SHUTDOWN ) || ( isolatedV24 > MAX_ISOLATED_24V_LEVEL_ON_SS_EXPIRED ) )
                 {
                     SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DG_SAFETY_SHUTDOWN_POST_TEST_FAILED, 1.0, v24 );
                     safetyShutdownSelfTestStatus = SELF_TEST_STATUS_FAILED;
@@ -147,10 +147,10 @@
             if ( TRUE == didTimeout( safetyShutdownSelfTestTimerCount, SAFETY_SHUTDOWN_RECOVERY_TIME_MS ) )
             {
                 F32 v24         = getIntADCVoltageConverted( INT_ADC_SECONDARY_HEATER_24_VOLTS );
-                F32 isolatedV24 = getMonitoredLineLevel( MONITORED_LINE_24V_POWER_PRIM_HTR_V );
+                F32 isolatedV24 = getRawIsolatedPowerSupplyVoltage();
 
                 // Verify 24V is down when w.d. recovered
-                if ( v24 < MIN_24V_LEVEL_ON_SAFETY_RECOVER )
+                if ( ( v24 < MIN_24V_LEVEL_ON_SAFETY_RECOVER ) || ( isolatedV24 < MAX_ISOLATED_24V_LEVEL_ON_SS_EXPIRED ) )
                 {
                     // 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 );