diff --git a/src/Libraries/Infrastructure/DatabaseExtensions.cs b/src/Libraries/Infrastructure/DatabaseExtensions.cs
index 8bcf7f0..b842445 100644
--- a/src/Libraries/Infrastructure/DatabaseExtensions.cs
+++ b/src/Libraries/Infrastructure/DatabaseExtensions.cs
@@ -14,6 +14,13 @@ public static class DatabaseExtensions
 {
     public static IHostApplicationBuilder AddDatabaseServices(this IHostApplicationBuilder builder)
     {
+        if (!builder.Services.Any(x => x.ServiceType == typeof(ICurrentUserService)))
+        {
+            throw new InvalidOperationException(
+                "ICurrentUserService must be registered before calling AddDatabaseServices. " +
+                "Register an implementation using builder.Services.AddScoped<ICurrentUserService, YourImplementation>()");
+        }
+
         builder.Services.AddScoped<AuditSaveChangesInterceptor>();
 
         builder.Services.AddDbContext<AuditContext>((sp, options) =>