diff --git a/firmware/Venus_Release/VenusReleaseFiles/PageChargingStrategy.qml b/firmware/Venus_Release/VenusReleaseFiles/PageChargingStrategy.qml
index 15ad32143..76f89251d 100644
--- a/firmware/Venus_Release/VenusReleaseFiles/PageChargingStrategy.qml
+++ b/firmware/Venus_Release/VenusReleaseFiles/PageChargingStrategy.qml
@@ -130,6 +130,11 @@ MbPage {
 					isCalibrationActive = true;
 				} else if (controllerState.value === 3 && isCalibrationActive) {
 					console.log("Stopping manual calibration charge...");
+					lastEoc.setValue(previousEocValue);
+					console.log("Reverted lastEoc to previous value: " + previousEocValue);
+					isCalibrationActive = false;
+				} else if (controllerState.value === 3 && !isCalibrationActive) {
+					console.log("Stopping automatic calibration charge...");
 					if(previousEocValue==0){
 						console.log("Postpone automatic calibration charge to 1 day later.");
 						lastEoc.setValue((new Date().getTime() - 24*60*60*1000)/1000);
@@ -138,7 +143,7 @@ MbPage {
 						console.log("Reverted lastEoc to previous value: " + previousEocValue);
 					}
 					isCalibrationActive = false;
-				} else {
+				}  else {
 					isCalibrationActive = false;
 				}