diff --git a/src/FubarDev.FtpServer/ServiceCollectionExtensions.cs b/src/FubarDev.FtpServer/ServiceCollectionExtensions.cs
index 18417843..28d31fea 100644
--- a/src/FubarDev.FtpServer/ServiceCollectionExtensions.cs
+++ b/src/FubarDev.FtpServer/ServiceCollectionExtensions.cs
@@ -61,7 +61,7 @@ public static IServiceCollection AddFtpServer(
             services.TryAddScoped<IFtpCommandHandlerProvider, DefaultFtpCommandHandlerProvider>();
 
             // Command handler extensions
-            services.AddSingleton<IFtpCommandHandlerExtensionScanner>(
+            services.AddScoped<IFtpCommandHandlerExtensionScanner>(
                 sp => new AssemblyFtpCommandHandlerExtensionScanner(
                     sp.GetRequiredService<IFtpCommandHandlerProvider>(),
                     sp.GetService<ILogger<AssemblyFtpCommandHandlerExtensionScanner>>(),