diff --git a/core/loadpoint.go b/core/loadpoint.go
index 95bb98d85..be635703b 100644
--- a/core/loadpoint.go
+++ b/core/loadpoint.go
@@ -285,7 +285,7 @@ func (lp *LoadPoint) evVehicleDisconnectHandler() {
 	lp.notify(evVehicleDisconnect)
 
 	// set default mode on disconnect
-	if lp.OnDisconnect.Mode != "" {
+	if lp.OnDisconnect.Mode != "" && lp.GetMode() != api.ModeOff {
 		lp.SetMode(lp.OnDisconnect.Mode)
 	}
 	if lp.OnDisconnect.TargetSoC != 0 {