diff --git a/TeslaSolarCharger/Server/Services/ChargingService.cs b/TeslaSolarCharger/Server/Services/ChargingService.cs
index 351f6e39f..43d60c98c 100644
--- a/TeslaSolarCharger/Server/Services/ChargingService.cs
+++ b/TeslaSolarCharger/Server/Services/ChargingService.cs
@@ -165,7 +165,9 @@ private async Task CalculateGeofences()
                 .Select(c => new { c.UseFleetTelemetry, c.IncludeTrackingRelevantFields })
                 .FirstAsync();
 
-            if (fleetTelemetrySettings.UseFleetTelemetry && !fleetTelemetrySettings.IncludeTrackingRelevantFields)
+            if (fleetTelemetrySettings.UseFleetTelemetry
+                && !fleetTelemetrySettings.IncludeTrackingRelevantFields
+                && configurationWrapper.GetVehicleDataFromTesla())
             {
                 logger.LogDebug("Car {carId} uses fleet telemetry but does not include tracking relevant fields. Do not calculate geofence", car.Id);
                 car.DistanceToHomeGeofence = null;