diff --git a/src/ScadaLink.ConfigurationDatabase/Repositories/TemplateEngineRepository.cs b/src/ScadaLink.ConfigurationDatabase/Repositories/TemplateEngineRepository.cs
index 8b3a4bb..910d4d2 100644
--- a/src/ScadaLink.ConfigurationDatabase/Repositories/TemplateEngineRepository.cs
+++ b/src/ScadaLink.ConfigurationDatabase/Repositories/TemplateEngineRepository.cs
@@ -401,31 +401,34 @@ public class TemplateEngineRepository : ITemplateEngineRepository
         }
     }
 
-    public async Task<int> SaveChangesAsync(CancellationToken cancellationToken = default)
-    {
-        return await _context.SaveChangesAsync(cancellationToken);
-    }
-
     // TemplateFolder
 
     public async Task<TemplateFolder?> GetFolderByIdAsync(int id, CancellationToken cancellationToken = default)
-        => await _context.TemplateFolders.FirstOrDefaultAsync(f => f.Id == id, cancellationToken);
+        => await _context.TemplateFolders.FindAsync(new object[] { id }, cancellationToken);
 
     public async Task<IReadOnlyList<TemplateFolder>> GetAllFoldersAsync(CancellationToken cancellationToken = default)
-        => await _context.TemplateFolders.AsNoTracking().ToListAsync(cancellationToken);
+        => await _context.TemplateFolders.ToListAsync(cancellationToken);
 
     public async Task AddFolderAsync(TemplateFolder folder, CancellationToken cancellationToken = default)
         => await _context.TemplateFolders.AddAsync(folder, cancellationToken);
 
-    public async Task UpdateFolderAsync(TemplateFolder folder, CancellationToken cancellationToken = default)
+    public Task UpdateFolderAsync(TemplateFolder folder, CancellationToken cancellationToken = default)
     {
         _context.TemplateFolders.Update(folder);
-        await Task.CompletedTask;
+        return Task.CompletedTask;
     }
 
     public async Task DeleteFolderAsync(int id, CancellationToken cancellationToken = default)
     {
-        var folder = await _context.TemplateFolders.FirstOrDefaultAsync(f => f.Id == id, cancellationToken);
-        if (folder != null) _context.TemplateFolders.Remove(folder);
+        var folder = await _context.TemplateFolders.FindAsync(new object[] { id }, cancellationToken);
+        if (folder != null)
+        {
+            _context.TemplateFolders.Remove(folder);
+        }
+    }
+
+    public async Task<int> SaveChangesAsync(CancellationToken cancellationToken = default)
+    {
+        return await _context.SaveChangesAsync(cancellationToken);
     }
 }