diff --git a/AsbCloudInfrastructure/Services/SAUB/TelemetryDataCache.cs b/AsbCloudInfrastructure/Services/SAUB/TelemetryDataCache.cs
index a75c7bf3..0dcfe080 100644
--- a/AsbCloudInfrastructure/Services/SAUB/TelemetryDataCache.cs
+++ b/AsbCloudInfrastructure/Services/SAUB/TelemetryDataCache.cs
@@ -148,17 +148,18 @@ namespace AsbCloudInfrastructure.Services.SAUB
         {
             if (!caches.TryGetValue(idTelemetry, out TelemetryDataCacheItem? cacheItem))
                 return null;
-
-            var from = cacheItem.FirstByDate?.DateTime;
+            
             if (!cacheItem.LastData.Any())
                 return null;
 
+            var from = cacheItem.FirstByDate.DateTime;
             var to = cacheItem.LastData[^1].DateTime;
-            from = from ?? cacheItem.LastData[0].DateTime;
 
-            return new DatesRangeDto { 
-                From = from.Value.ToUtcDateTimeOffset(cacheItem.TimezoneHours), 
-                To = to.ToUtcDateTimeOffset(cacheItem.TimezoneHours) };
+            return new DatesRangeDto 
+            { 
+                From = new DateTimeOffset(from, TimeSpan.FromHours(cacheItem.TimezoneHours)),
+                To = new DateTimeOffset(to, TimeSpan.FromHours(cacheItem.TimezoneHours)) 
+            };
         }
 
         public DatesRangeDto? GetOrDefaultCachedDateRange(int idTelemetry)
diff --git a/AsbCloudInfrastructure/Services/WellService.cs b/AsbCloudInfrastructure/Services/WellService.cs
index 6ed241a0..795d944b 100644
--- a/AsbCloudInfrastructure/Services/WellService.cs
+++ b/AsbCloudInfrastructure/Services/WellService.cs
@@ -71,7 +71,7 @@ namespace AsbCloudInfrastructure.Services
                 return DateTimeOffset.MinValue;
 
             var datesRange = telemetryService.GetDatesRange(well.IdTelemetry.Value);
-            return datesRange.To.DateTime;
+            return datesRange.To;
         }
 
         /// <inheritdoc/>