diff --git a/src/infrastructure/DigitalData.MessagingService.Infrastructure/Repositories/ReceivedEmailRepository.cs b/src/infrastructure/DigitalData.MessagingService.Infrastructure/Repositories/ReceivedEmailRepository.cs
index 7a8cf6c..dffc326 100644
--- a/src/infrastructure/DigitalData.MessagingService.Infrastructure/Repositories/ReceivedEmailRepository.cs
+++ b/src/infrastructure/DigitalData.MessagingService.Infrastructure/Repositories/ReceivedEmailRepository.cs
@@ -11,7 +11,7 @@ public class ReceivedEmailRepository(MessagingServiceDbContext Context, IMapper
 {
     public async Task<IEnumerable<ReceivedEmail>> FindAsync(MailSearchFilter mailSearchFilter, EmailAccount? accountQuery = null, CancellationToken cancellationToken = default)
     {
-        IQueryable<ReceivedEmail> query = DbSet;
+        var query = DbSet.AsNoTracking();
 
         // ── Account filter ─────────────────────────────────────────────────────
         if (accountQuery is not null)
diff --git a/src/infrastructure/DigitalData.MessagingService.Infrastructure/Repositories/Repository.cs b/src/infrastructure/DigitalData.MessagingService.Infrastructure/Repositories/Repository.cs
index 8619c92..75be941 100644
--- a/src/infrastructure/DigitalData.MessagingService.Infrastructure/Repositories/Repository.cs
+++ b/src/infrastructure/DigitalData.MessagingService.Infrastructure/Repositories/Repository.cs
@@ -25,7 +25,7 @@ public class Repository<TEntity>(MessagingServiceDbContext Context, IMapper Mapp
         return entity;
     }
 
-    public async Task<IEnumerable<TEntity>> CreateAsync<TDto>(IEnumerable<TDto> dtos, CancellationToken cancellationToken = default)
+    public async Task<IEnumerable<TEntity>> CreateRangeAsync<TDto>(IEnumerable<TDto> dtos, CancellationToken cancellationToken = default)
     {
         var entities = Mapper.Map<IEnumerable<TEntity>>(dtos);
         await DbSet.AddRangeAsync(entities, cancellationToken);