diff --git a/core/loadpoint.go b/core/loadpoint.go
index b619461e2..8c1a70e39 100644
--- a/core/loadpoint.go
+++ b/core/loadpoint.go
@@ -357,13 +357,12 @@ func (lp *LoadPoint) Prepare(uiChan chan<- util.Param, pushChan chan<- push.Even
 	if enabled, err := lp.charger.Enabled(); err == nil {
 		if lp.enabled = enabled; enabled {
 			lp.guardUpdated = lp.clock.Now()
+			// set defined current for use by pv mode
+			_ = lp.setLimit(lp.MinCurrent, false)
 		}
 	} else {
 		lp.log.ERROR.Printf("charger error: %v", err)
 	}
-
-	// prepare charger status
-	_ = lp.setLimit(lp.MinCurrent, false)
 }
 
 func (lp *LoadPoint) syncCharger() {