diff --git a/apps/settings.c b/apps/settings.c
index 3bfbd9670f..cd838b9627 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -349,14 +349,9 @@ int settings_save( void )
     {
         static long lasttime = 0;
 
-        /* reset counter if charger is inserted */
-        if ( charger_inserted() ) {
-            global_settings.runtime = 0;
-        }
-        else {
-            global_settings.runtime += (current_tick - lasttime) / HZ;
-            lasttime = current_tick;
-        }
+        global_settings.runtime += (current_tick - lasttime) / HZ;
+        lasttime = current_tick;
+
         if ( global_settings.runtime > global_settings.topruntime )
             global_settings.topruntime = global_settings.runtime;
 
diff --git a/apps/status.c b/apps/status.c
index 31d2cbe2cf..8e4a2c9b08 100644
--- a/apps/status.c
+++ b/apps/status.c
@@ -137,6 +137,7 @@ void status_draw(void)
     }
     if(charger_inserted())
     {
+        global_settings.runtime = 0;
         if(TIME_AFTER(current_tick, switch_tick))
         {
             lcd_icon(ICON_BATTERY, true);
@@ -202,6 +203,7 @@ void status_draw(void)
             battery_state = true;
             plug_state = true;
             if(charger_enabled) { /* animate battery if charging */
+                global_settings.runtime = 0;
                 battlevel = battery_charge_step * 34; /* 34 for a better look */
                 battlevel = battlevel > 100 ? 100 : battlevel;
                 if(TIME_AFTER(current_tick, switch_tick)) {