diff --git a/src/systemtask/SystemTask.cpp b/src/systemtask/SystemTask.cpp
index 5441c162..09c7e88d 100644
--- a/src/systemtask/SystemTask.cpp
+++ b/src/systemtask/SystemTask.cpp
@@ -347,6 +347,10 @@ void SystemTask::Work() {
         case Messages::OnChargingEvent:
           batteryController.Update();
           motorController.RunForDuration(15);
+          ReloadIdleTimer();
+          if (isSleeping && !isWakingUp) {
+            GoToRunning();
+          }
           break;
         case Messages::MeasureBatteryTimerExpired:
           sendBatteryNotification = true;