diff --git a/core/loadpoint.go b/core/loadpoint.go
index 9a119d827..d95ea63cf 100644
--- a/core/loadpoint.go
+++ b/core/loadpoint.go
@@ -1598,23 +1598,34 @@ func (lp *Loadpoint) publishChargeProgress() {
 // publish state of charge, remaining charge duration and range
 func (lp *Loadpoint) publishSocAndRange() {
 	soc, err := lp.chargerSoc()
+	if err == nil {
+		lp.vehicleSoc = soc
+		lp.publish(keys.VehicleSoc, lp.vehicleSoc)
 
-	// guard for socEstimator removed by api
-	// also keep a local copy in order to avoid race conditions
-	// https://github.com/evcc-io/evcc/issues/16180
-	socEstimator := lp.socEstimator
-	if socEstimator == nil || (!lp.vehicleHasSoc() && err != nil) {
-		// This is a workaround for heaters. Without vehicle, the soc estimator is not initialized.
-		// We need to check if the charger can provide soc and use it if available.
-		if err == nil {
-			lp.vehicleSoc = soc
-			lp.publish(keys.VehicleSoc, lp.vehicleSoc)
+		if limit, err := lp.chargerSocLimit(); err == nil {
+			lp.log.DEBUG.Printf("charger soc limit: %d%%", limit)
+			// https://github.com/evcc-io/evcc/issues/13349
+			lp.publish(keys.VehicleLimitSoc, float64(limit))
+		} else if !errors.Is(err, api.ErrNotAvailable) {
+			lp.log.ERROR.Printf("charger soc limit: %v", err)
 		}
 
 		return
+	} else if !errors.Is(err, api.ErrNotAvailable) {
+		lp.log.ERROR.Printf("charger soc: %v", err)
 	}
 
-	if err == nil || lp.chargerHasFeature(api.IntegratedDevice) || lp.vehicleSocPollAllowed() {
+	// guard for socEstimator removed by api and keep a local copy in order to avoid race conditions
+	// https://github.com/evcc-io/evcc/issues/16180
+	socEstimator := lp.socEstimator
+
+	// soc not available
+	if socEstimator == nil || !lp.vehicleHasSoc() {
+		return
+	}
+
+	// integrated device can bypass the update interval if vehicle is separately configured (legacy)
+	if lp.chargerHasFeature(api.IntegratedDevice) || lp.vehicleSocPollAllowed() {
 		lp.socUpdated = lp.clock.Now()
 
 		f, err := socEstimator.Soc(lp.GetChargedEnergy())
@@ -1636,13 +1647,8 @@ func (lp *Loadpoint) publishSocAndRange() {
 		// TODO take vehicle api limits into account
 		apiLimitSoc := 100
 
-		// integrated device with charger limit
-		vs, ok := lp.charger.(api.SocLimiter)
-		if !ok {
-			// vehicle limit
-			vs, ok = lp.GetVehicle().(api.SocLimiter)
-		}
-		if ok {
+		// vehicle limit
+		if vs, ok := lp.GetVehicle().(api.SocLimiter); ok {
 			if limit, err := vs.GetLimitSoc(); err == nil {
 				apiLimitSoc = int(limit)
 				lp.log.DEBUG.Printf("vehicle soc limit: %d%%", limit)
diff --git a/core/loadpoint_charger.go b/core/loadpoint_charger.go
index dd3818a8b..dcd0cb5e3 100644
--- a/core/loadpoint_charger.go
+++ b/core/loadpoint_charger.go
@@ -33,3 +33,11 @@ func (lp *Loadpoint) chargerSoc() (float64, error) {
 	}
 	return 0, api.ErrNotAvailable
 }
+
+// chargerSocLimit returns charger soc limit if available
+func (lp *Loadpoint) chargerSocLimit() (int64, error) {
+	if c, ok := lp.charger.(api.SocLimiter); ok {
+		return c.GetLimitSoc()
+	}
+	return 0, api.ErrNotAvailable
+}