diff --git a/core/loadpoint_effective.go b/core/loadpoint_effective.go
index 358f1d038..49d1b7461 100644
--- a/core/loadpoint_effective.go
+++ b/core/loadpoint_effective.go
@@ -233,12 +233,13 @@ func (lp *Loadpoint) EffectiveMaxPower() float64 {
 
 // effectiveMaxPower returns the effective max power taking vehicle capabilities and phase scaling into account
 func (lp *Loadpoint) effectiveMaxPower() float64 {
+	res := Voltage * lp.effectiveMaxCurrent() * float64(lp.maxActivePhases())
 	if lp.vehicle != nil {
 		if maxPower, ok := lp.vehicle.OnIdentified().GetMaxPower(); ok {
-			return maxPower
+			return min(maxPower, res)
 		}
 	}
-	return Voltage * lp.effectiveMaxCurrent() * float64(lp.maxActivePhases())
+	return res
 }
 
 // EffectivePlanStrategy returns the effective plan strategy