diff --git a/apps/misc.c b/apps/misc.c
index 07b4c947a2..3dfc2892ca 100644
--- a/apps/misc.c
+++ b/apps/misc.c
@@ -264,11 +264,7 @@ static bool clean_shutdown(void (*callback)(void *), void *parameter)
     scrobbler_poweroff();
 
 #if CONFIG_CHARGING && !defined(HAVE_POWEROFF_WHILE_CHARGING)
-#if CONFIG_CHARGING >= CHARGING_MONITOR
-    if(!charging_state())
-#else
     if(!charger_inserted())
-#endif
 #endif
     {
         bool batt_safe = battery_level_safe();
@@ -410,11 +406,7 @@ bool list_stop_handler(void)
 
         if (TIME_BEFORE(current_tick, last_off + HZ/2))
         {
-#if CONFIG_CHARGING >= CHARGING_MONITOR
-            if (charging_state())
-#else
-            if (charger_inserted())
-#endif
+            if (charger_inserted()) 
             {
                 charging_splash();
                 ret = true;  /* screen is dirty, caller needs to refresh */
diff --git a/firmware/drivers/button.c b/firmware/drivers/button.c
index f116ad646e..91b8ebd0c3 100644
--- a/firmware/drivers/button.c
+++ b/firmware/drivers/button.c
@@ -205,11 +205,7 @@ 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)
                         {
diff --git a/firmware/powermgmt.c b/firmware/powermgmt.c
index bf5734c264..f1dd83ef52 100644
--- a/firmware/powermgmt.c
+++ b/firmware/powermgmt.c
@@ -358,11 +358,7 @@ 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");