diff --git a/OVMS.V3/components/vehicle_renaultzoe_ph2/src/vehicle_renaultzoe_ph2.cpp b/OVMS.V3/components/vehicle_renaultzoe_ph2/src/vehicle_renaultzoe_ph2.cpp
index d391c13..6568662 100644
--- a/OVMS.V3/components/vehicle_renaultzoe_ph2/src/vehicle_renaultzoe_ph2.cpp
+++ b/OVMS.V3/components/vehicle_renaultzoe_ph2/src/vehicle_renaultzoe_ph2.cpp
@@ -353,6 +353,11 @@ void OvmsVehicleRenaultZoePh2::Ticker1(uint32_t ticker) {
     StandardMetrics.ms_v_charge_duration_full->SetValue(0);
     ESP_LOGI(TAG, "Pollstate switched to OFF, Wait for power...");
     POLLSTATE_OFF;
+  } else if (StandardMetrics.ms_v_charge_pilot->AsBool() && CarIsCharging && StandardMetrics.ms_v_charge_state->AsString() == "done") {
+    CarIsCharging = false;
+    StandardMetrics.ms_v_charge_duration_full->SetValue(0);
+    ESP_LOGI(TAG, "Pollstate switched to OFF, done charging...");
+    POLLSTATE_OFF;
   }
 
   if (StandardMetrics.ms_v_env_on->AsBool() && !m_UseCarTrip) {