diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h
index 7ae27ca3f..23b7082e6 100755
--- a/Firmware/Marlin.h
+++ b/Firmware/Marlin.h
@@ -313,6 +313,11 @@ extern LongTimer safetyTimer;
 // the print is paused, that still counts as a "running" print.
 bool printJobOngoing();
 
+// Make debug_printer_states available everywhere
+#ifdef DEBUG_PRINTER_STATES
+void debug_printer_states();
+#endif //DEBUG_PRINTER_STATES
+
 // Printing is paused according to SD or host indicators
 bool printingIsPaused();
 
diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp
index 8c037d084..2f5de0b15 100644
--- a/Firmware/Marlin_main.cpp
+++ b/Firmware/Marlin_main.cpp
@@ -572,6 +572,7 @@ void debug_printer_states()
     printf_P(PSTR("DBG:fsensor.isEnabled() = %d\n"), (int)fsensor.isEnabled());
     printf_P(PSTR("DBG:fsensor.getAutoLoadEnabled() = %d\n"), (int)fsensor.getAutoLoadEnabled());
     printf_P(PSTR("DBG:custom_message_type = %d\n"), (int)custom_message_type);
+    printf_P(PSTR("DBG:uvlo_auto_recovery_ready = %d\n"), (int)uvlo_auto_recovery_ready);
     SERIAL_ECHOLN("");
 }
 #endif //End DEBUG_PRINTER_STATES
@@ -6053,6 +6054,9 @@ Sigma_Exit:
                 SetHostStatusScreenName(str.GetUnquotedString());
             }
         }
+#ifdef DEBUG_PRINTER_STATES
+        debug_printer_states();
+#endif //DEBUG_PRINTER_STATES
 
         if (eeprom_read_byte((uint8_t*)EEPROM_UVLO_PRINT_TYPE) == PowerPanic::PRINT_TYPE_HOST
            && printer_recovering()
diff --git a/Firmware/ultralcd.h b/Firmware/ultralcd.h
index 71caf73ea..34a845ed2 100755
--- a/Firmware/ultralcd.h
+++ b/Firmware/ultralcd.h
@@ -136,16 +136,16 @@ extern LcdCommands lcd_commands_type;
 
 enum class CustomMsg : uint_least8_t
 {
-    Status,          //!< status message from lcd_status_message variable
-    MeshBedLeveling, //!< Mesh bed leveling in progress
-    FilamentLoading, //!< Loading filament in progress
-    PidCal,          //!< PID tuning in progress
-    TempCal,         //!< PINDA temperature calibration
-    TempCompPreheat, //!< Temperature compensation preheat
-    M0Wait,          //!< M0/M1 Wait command working even from SD
-    M117,            //!< M117 Set the status line message on the LCD
-    Resuming,        //!< Resuming message
-    MMUProgress,     ///< MMU progress message
+    Status,          //!< 0 status message from lcd_status_message variable
+    MeshBedLeveling, //!< 1 Mesh bed leveling in progress
+    FilamentLoading, //!< 2 Loading filament in progress
+    PidCal,          //!< 3 PID tuning in progress
+    TempCal,         //!< 4 PINDA temperature calibration
+    TempCompPreheat, //!< 5 Temperature compensation preheat
+    M0Wait,          //!< 6 M0/M1 Wait command working even from SD
+    M117,            //!< 7 M117 Set the status line message on the LCD
+    Resuming,        //!< 8 Resuming message
+    MMUProgress,     ///< 9 MMU progress message
 };
 
 extern CustomMsg custom_message_type;