diff --git a/core/loadpoint.go b/core/loadpoint.go
index e0e4b81bd..0c3b5184b 100644
--- a/core/loadpoint.go
+++ b/core/loadpoint.go
@@ -473,11 +473,6 @@ func (lp *Loadpoint) evChargeStopHandler() {
 func (lp *Loadpoint) evVehicleConnectHandler() {
 	lp.log.INFO.Printf("car connected")
 
-	// energy
-	lp.energyMetrics.Reset()
-	lp.energyMetrics.Publish("session", lp)
-	lp.publish(keys.ChargedEnergy, lp.GetChargedEnergy())
-
 	// duration
 	lp.connectedTime = lp.clock.Now()
 	lp.publish(keys.ConnectedDuration, time.Duration(0))
diff --git a/core/loadpoint_session.go b/core/loadpoint_session.go
index f6decb653..96ab15ccc 100644
--- a/core/loadpoint_session.go
+++ b/core/loadpoint_session.go
@@ -2,6 +2,7 @@ package core
 
 import (
 	"github.com/evcc-io/evcc/api"
+	"github.com/evcc-io/evcc/core/keys"
 	"github.com/evcc-io/evcc/core/session"
 	"github.com/jinzhu/now"
 	"github.com/samber/lo"
@@ -45,6 +46,11 @@ func (lp *Loadpoint) createSession() {
 			lp.session.Identifier = id
 		}
 	}
+
+	// energy
+	lp.energyMetrics.Reset()
+	lp.energyMetrics.Publish("session", lp)
+	lp.publish(keys.ChargedEnergy, lp.GetChargedEnergy())
 }
 
 // stopSession ends a charging session segment and persists the session.