diff --git a/core/loadpoint.go b/core/loadpoint.go
index b97edf86f4..714f7e4e31 100644
--- a/core/loadpoint.go
+++ b/core/loadpoint.go
@@ -436,7 +436,6 @@ func (lp *LoadPoint) evVehicleDisconnectHandler() {
 	// remove active vehicle if not default
 	if lp.vehicle != lp.defaultVehicle {
 		lp.setActiveVehicle(lp.defaultVehicle)
-		lp.unpublishVehicle()
 	}
 
 	// set default mode on disconnect
@@ -533,6 +532,11 @@ func (lp *LoadPoint) Prepare(uiChan chan<- util.Param, pushChan chan<- push.Even
 	lp.publishTimer(phaseTimer, 0, timerInactive)
 	lp.publishTimer(pvTimer, 0, timerInactive)
 
+	// assign and publish default vehicle
+	if lp.defaultVehicle != nil {
+		lp.setActiveVehicle(lp.defaultVehicle)
+	}
+
 	lp.Lock()
 	lp.publish("mode", lp.Mode)
 	lp.publish("targetSoC", lp.SoC.target)