diff --git a/AsbCloudInfrastructure/MemoryCacheExtentions.cs b/AsbCloudInfrastructure/MemoryCacheExtentions.cs
index c616aa9a..0153778a 100644
--- a/AsbCloudInfrastructure/MemoryCacheExtentions.cs
+++ b/AsbCloudInfrastructure/MemoryCacheExtentions.cs
@@ -23,10 +23,12 @@ namespace AsbCloudInfrastructure
         /// <param name="token"></param>
         /// <returns></returns>
         public static Task<IEnumerable<T>> GetOrCreateBasicAsync<T>(this IMemoryCache memoryCache, IQueryable<T> query, CancellationToken token)
+            where T : class
         {
             var getter = async (CancellationToken token) =>
             {
                 var entities = await query
+                    .AsNoTracking()
                     .ToArrayAsync(token);
                 return entities.AsEnumerable();
             };
@@ -63,8 +65,11 @@ namespace AsbCloudInfrastructure
         /// <param name="query"></param>
         /// <returns></returns>
         public static IEnumerable<T> GetOrCreateBasic<T>(this IMemoryCache memoryCache, IQueryable<T> query)
+            where T : class
         {
-            var getter = () => query.ToArray();
+            var getter = () => query
+                .AsNoTracking()
+                .ToArray();
             return memoryCache.GetOrCreateBasic(getter);
         }
 
diff --git a/AsbCloudInfrastructure/Services/SAUB/TelemetryService.cs b/AsbCloudInfrastructure/Services/SAUB/TelemetryService.cs
index 1ec0b0cf..811f9beb 100644
--- a/AsbCloudInfrastructure/Services/SAUB/TelemetryService.cs
+++ b/AsbCloudInfrastructure/Services/SAUB/TelemetryService.cs
@@ -83,7 +83,7 @@ namespace AsbCloudInfrastructure.Services.SAUB
                 throw new Exception($"Telemetry id: {idTelemetry} does not exist.");
 
             if (telemetry.Well?.Timezone is not null)            
-                return telemetry.TimeZone.Adapt<SimpleTimezoneDto>();
+                return telemetry.Well.Timezone.Adapt<SimpleTimezoneDto>();
             
             if (telemetry.TimeZone is not null)            
                 return telemetry.TimeZone.Adapt<SimpleTimezoneDto>();