diff --git a/core/loadpoint.go b/core/loadpoint.go
index 4bb48441c..eb8c92554 100644
--- a/core/loadpoint.go
+++ b/core/loadpoint.go
@@ -1161,7 +1161,7 @@ func (lp *Loadpoint) pvMaxCurrent(mode api.ChargeMode, sitePower float64, batter
 	maxCurrent := lp.effectiveMaxCurrent()
 
 	// switch phases up/down
-	if lp.hasPhaseSwitching() {
+	if lp.hasPhaseSwitching() && lp.phaseSwitchCompleted() {
 		_ = lp.pvScalePhases(sitePower, minCurrent, maxCurrent)
 	}