diff --git a/core/loadpoint.go b/core/loadpoint.go
index a01b40ed4..8d6f65703 100644
--- a/core/loadpoint.go
+++ b/core/loadpoint.go
@@ -1408,7 +1408,7 @@ func (lp *LoadPoint) Update(sitePower float64, cheap bool, batteryBuffered bool)
 	// track if remote disabled is actually active
 	remoteDisabled := loadpoint.RemoteEnable
 
-	// reset detection if soc timer needs be deactived after evaluating the loading strategy
+	// reset detection if soc timer needs be deactivated after evaluating the loading strategy
 	lp.socTimer.MustValidateDemand()
 
 	// execute loading strategy
diff --git a/core/soc/estimator.go b/core/soc/estimator.go
index fe6ae5f47..55b0929c0 100644
--- a/core/soc/estimator.go
+++ b/core/soc/estimator.go
@@ -121,8 +121,8 @@ func (s *Estimator) SoC(chargedEnergy float64) (float64, error) {
 				s.log.WARN.Printf("vehicle soc (charger): %v (ignored by estimator)", err)
 			}
 
-			s.vehicleSoc = f
 			fetchedSoC = &f
+			s.vehicleSoc = f
 		}
 	}