2 files changed, 8 insertions, 0 deletions

diff --git a/firmware/drivers/button.c b/firmware/drivers/button.c
index f7523d776c..100957b77a 100644
--- a/firmware/drivers/button.c
+++ b/firmware/drivers/button.c
@@ -205,8 +205,12 @@ static void button_tick(void)
 #endif
                                     ) &&
 #if CONFIG_CHARGING && !defined(HAVE_POWEROFF_WHILE_CHARGING)
+#if CONFIG_CHARGING >= CHARGING_MONITOR
+                                !charging_state() &&
+#else
                                 !charger_inserted() &&
 #endif
+#endif
                                 repeat_count > POWEROFF_COUNT)
                         {
                             /* Tell the main thread that it's time to
diff --git a/firmware/powermgmt.c b/firmware/powermgmt.c
index f1dd83ef52..bf5734c264 100644
--- a/firmware/powermgmt.c
+++ b/firmware/powermgmt.c
@@ -358,8 +358,12 @@ static void handle_auto_poweroff(void)
 
             if (usb_inserted()
 #if CONFIG_CHARGING && !defined(HAVE_POWEROFF_WHILE_CHARGING)
+#if CONFIG_CHARGING >= CHARGING_MONITOR
+                || charging_state()
+#else
                 || charger_input_state != NO_CHARGER
 #endif
+#endif
             ) {
                 DEBUGF("Sleep timer timeout. Stopping...\n");
                 set_sleep_timer(0);