diff --git a/TeslaSolarCharger/Server/Services/FleetTelemetryWebSocketService.cs b/TeslaSolarCharger/Server/Services/FleetTelemetryWebSocketService.cs
index 83a2786c9..4a2723c47 100644
--- a/TeslaSolarCharger/Server/Services/FleetTelemetryWebSocketService.cs
+++ b/TeslaSolarCharger/Server/Services/FleetTelemetryWebSocketService.cs
@@ -44,7 +44,9 @@ public async Task ReconnectWebSocketsForEnabledCars()
         var cars = await context.Cars
             .Where(c => c.UseFleetTelemetry
                         && (c.ShouldBeManaged == true)
-                        && (c.TeslaFleetApiState != TeslaCarFleetApiState.NotWorking))
+                        && (c.TeslaFleetApiState != TeslaCarFleetApiState.NotWorking)
+                        && (c.TeslaFleetApiState != TeslaCarFleetApiState.OpenedLinkButNotTested)
+                        && (c.TeslaFleetApiState != TeslaCarFleetApiState.NotConfigured))
             .Select(c => new { c.Vin, c.UseFleetTelemetryForLocationData, })
             .ToListAsync();
         var bytesToSend = Encoding.UTF8.GetBytes("Heartbeat");