diff --git a/core/loadpoint.go b/core/loadpoint.go
index a37c9a9d0..d0186091e 100644
--- a/core/loadpoint.go
+++ b/core/loadpoint.go
@@ -316,9 +316,12 @@ func (lp *LoadPoint) evVehicleConnectHandler() {
 		lp.socEstimator.Reset()
 	}
 
-	// flush all vahicles before updating state
+	// flush all vehicles before updating state
 	provider.ResetCached()
 
+	// immediately allow pv mode activity
+	lp.pvDisableTimer()
+
 	lp.triggerEvent(evVehicleConnect)
 }
 
diff --git a/core/loadpoint_api.go b/core/loadpoint_api.go
index d7e81909c..91a9e9b1b 100644
--- a/core/loadpoint_api.go
+++ b/core/loadpoint_api.go
@@ -52,6 +52,10 @@ func (lp *LoadPoint) SetMode(mode api.ChargeMode) {
 	if lp.Mode != mode {
 		lp.Mode = mode
 		lp.publish("mode", mode)
+
+		// immediately allow pv mode activity
+		lp.pvDisableTimer()
+
 		lp.requestUpdate()
 	}
 }