diff --git a/backend/Musify.Infrastructure/Persistence/Database.cs b/backend/Musify.Infrastructure/Persistence/Database.cs
index 12947e0..e3dbc84 100644
--- a/backend/Musify.Infrastructure/Persistence/Database.cs
+++ b/backend/Musify.Infrastructure/Persistence/Database.cs
@@ -15,7 +15,6 @@ namespace Musify.Infrastructure.Persistence
         protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
         {
             optionsBuilder.UseNpgsql(configuration.ConnectionString);
-            optionsBuilder.AddInterceptors(new AuditableEntityInterceptor());
         }
 
         protected override void OnModelCreating(ModelBuilder modelBuilder)
diff --git a/backend/Musify.Infrastructure/Persistence/DatabaseDependencyInjection.cs b/backend/Musify.Infrastructure/Persistence/DatabaseDependencyInjection.cs
index 6d3a9d9..a7fa1a8 100644
--- a/backend/Musify.Infrastructure/Persistence/DatabaseDependencyInjection.cs
+++ b/backend/Musify.Infrastructure/Persistence/DatabaseDependencyInjection.cs
@@ -1,3 +1,4 @@
+using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
@@ -18,7 +19,11 @@ namespace Musify.Infrastructure.Persistence
             serviceDescriptors.AddSingleton(serviceProvider =>
                 serviceProvider.GetRequiredService<IOptions<DatabaseConfiguration>>().Value);
 
-            serviceDescriptors.AddDbContext<Database>();
+            serviceDescriptors.AddSingleton<AuditableEntityInterceptor>();
+
+            serviceDescriptors.AddDbContext<Database>((serviceProvider, options) =>
+                options.AddInterceptors(serviceProvider.GetRequiredService<AuditableEntityInterceptor>()));
+
             serviceDescriptors.AddScoped<IDatabase>(serviceProvider => serviceProvider.GetRequiredService<Database>());
 
             return serviceDescriptors;