diff --git a/Net.Sdk.Web.Extensions/Net.Sdk.Web.Extensions.csproj b/Net.Sdk.Web.Extensions/Net.Sdk.Web.Extensions.csproj
index 29c184a..b2771bb 100644
--- a/Net.Sdk.Web.Extensions/Net.Sdk.Web.Extensions.csproj
+++ b/Net.Sdk.Web.Extensions/Net.Sdk.Web.Extensions.csproj
@@ -6,7 +6,7 @@
     <Nullable>enable</Nullable>
     <OutputType>Library</OutputType>
     <IsPackable>true</IsPackable>
-    <Version>0.8.6</Version>
+    <Version>0.8.7</Version>
     <Authors>Alexandru Macocian</Authors>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
diff --git a/Net.Sdk.Web.Extensions/WebApplicationExtensions.cs b/Net.Sdk.Web.Extensions/WebApplicationExtensions.cs
index f4c229f..230c7cc 100644
--- a/Net.Sdk.Web.Extensions/WebApplicationExtensions.cs
+++ b/Net.Sdk.Web.Extensions/WebApplicationExtensions.cs
@@ -30,16 +30,16 @@ public static class WebApplicationExtensions
         return webApplication;
     }
 
-    public static IEndpointConventionBuilder UseWebSocketRoute<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] TWebSocketRoute>(this WebApplication app, string route)
+    public static IEndpointConventionBuilder UseWebSocketRoute<TWebSocketRoute>(this WebApplication app, string route)
         where TWebSocketRoute : WebSocketRouteBase
     {
         app.ThrowIfNull();
-        return app.MapGet(route, async context =>
+        return app.MapGet(route, static async context =>
         {
             if (context.WebSockets.IsWebSocketRequest)
             {
-                var logger = app.Services.GetRequiredService<ILogger<TWebSocketRoute>>();
-                var route = app.Services.GetRequiredService<TWebSocketRoute>();
+                var logger = context.RequestServices.GetRequiredService<ILogger<TWebSocketRoute>>();
+                var route = context.RequestServices.GetRequiredService<TWebSocketRoute>();
                 var routeFilters = GetRouteFilters<TWebSocketRoute>(context).ToList();
 
                 var actionContext = new ActionContext(