diff --git a/TeslaSolarCharger/Server/Services/FleetTelemetryWebSocketService.cs b/TeslaSolarCharger/Server/Services/FleetTelemetryWebSocketService.cs
index dde94734c..aeca1b05d 100644
--- a/TeslaSolarCharger/Server/Services/FleetTelemetryWebSocketService.cs
+++ b/TeslaSolarCharger/Server/Services/FleetTelemetryWebSocketService.cs
@@ -304,7 +304,7 @@ private async Task ReceiveMessages(DtoFleetTelemetryWebSocketClients client, str
                                 {
                                     if (carValueLog.BooleanValue == true
                                         //Do only overwrite these states as otherwise Charging or Driving might be overwritten
-                                        && settingsCar.State is CarStateEnum.Unknown or CarStateEnum.Suspended)
+                                        && settingsCar.State is CarStateEnum.Unknown or CarStateEnum.Suspended or CarStateEnum.Online)
                                     {
                                         settingsCar.State = CarStateEnum.Offline;
                                         _propertyUpdateTimestamps[(settingsCar.Id, message.Type)] = carValueLog.Timestamp;