diff --git a/src/AzureMapsControl.Components/Extensions.cs b/src/AzureMapsControl.Components/Extensions.cs
index 65e96d5..635691e 100644
--- a/src/AzureMapsControl.Components/Extensions.cs
+++ b/src/AzureMapsControl.Components/Extensions.cs
@@ -26,9 +26,9 @@ public static class Extensions
         public static IServiceCollection AddAzureMapsControl(this IServiceCollection services, Action<AzureMapsConfiguration> configure)
         {
             services
-                .AddSingleton<MapService>()
-                .AddSingleton<IMapAdderService>(sp => sp.GetRequiredService<MapService>())
-                .AddSingleton<IMapService>(sp => sp.GetRequiredService<MapService>())
+                .AddScoped<MapService>()
+                .AddScoped<IMapAdderService>(sp => sp.GetRequiredService<MapService>())
+                .AddScoped<IMapService>(sp => sp.GetRequiredService<MapService>())
                 .AddScoped<IAnimationService, AnimationService>()
                 .AddScoped<IMapJsRuntime, MapJsRuntime>()
                 .AddScoped<IGeolocationService, GeolocationService>()