diff --git a/packages/services/server/package.json b/packages/services/server/package.json
index b0f38bdb3d..95c4e5213a 100644
--- a/packages/services/server/package.json
+++ b/packages/services/server/package.json
@@ -10,7 +10,6 @@
   },
   "devDependencies": {
     "@envelop/core": "5.0.2",
-    "@envelop/generic-auth": "7.0.0",
     "@envelop/graphql-jit": "8.0.3",
     "@envelop/graphql-modules": "6.0.0",
     "@envelop/opentelemetry": "6.3.1",
diff --git a/packages/services/server/src/graphql-handler.ts b/packages/services/server/src/graphql-handler.ts
index c951bd50e1..15c6682aa2 100644
--- a/packages/services/server/src/graphql-handler.ts
+++ b/packages/services/server/src/graphql-handler.ts
@@ -12,7 +12,6 @@ import {
 import { createYoga, Plugin, useErrorHandler, useExecutionCancellation } from 'graphql-yoga';
 import hyperid from 'hyperid';
 import { isGraphQLError } from '@envelop/core';
-import { useGenericAuth } from '@envelop/generic-auth';
 import { useGraphQlJit } from '@envelop/graphql-jit';
 import { useGraphQLModules } from '@envelop/graphql-modules';
 import { useOpenTelemetry } from '@envelop/opentelemetry';
@@ -157,13 +156,6 @@ export const graphqlHandler = (options: GraphQLHandlerOptions): RouteHandlerMeth
           }
         }
       }),
-      useGenericAuth({
-        mode: 'resolve-only',
-        contextFieldName: 'session',
-        async resolveUserFn(ctx: Context) {
-          return options.authN.authenticate(ctx);
-        },
-      }),
       useHive({
         debug: true,
         enabled: !!options.hiveConfig,
@@ -259,6 +251,7 @@ export const graphqlHandler = (options: GraphQLHandlerOptions): RouteHandlerMeth
   return async (req, reply) => {
     const requestIdHeader = req.headers['x-request-id'] ?? reqIdGenerate();
     const requestId = cleanRequestId(requestIdHeader);
+    const session = await options.authN.authenticate({ req, reply });
 
     await asyncStorage.run(
       {
@@ -271,6 +264,7 @@ export const graphqlHandler = (options: GraphQLHandlerOptions): RouteHandlerMeth
             reply,
             headers: req.headers,
             requestId,
+            session,
           });
         });
 
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index a585f0103d..bbd6d065be 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1142,9 +1142,6 @@ importers:
       '@envelop/core':
         specifier: 5.0.2
         version: 5.0.2
-      '@envelop/generic-auth':
-        specifier: 7.0.0
-        version: 7.0.0(@envelop/core@5.0.2)(graphql@16.9.0)
       '@envelop/graphql-jit':
         specifier: 8.0.3
         version: 8.0.3(@envelop/core@5.0.2)(graphql@16.9.0)
@@ -1847,7 +1844,7 @@ importers:
         version: 4.3.1(vite@5.4.6(@types/node@20.16.1)(less@4.2.0)(terser@5.31.1))
       autoprefixer:
         specifier: 10.4.20
-        version: 10.4.20(postcss@8.4.47)
+        version: 10.4.20(postcss@8.4.41)
       class-variance-authority:
         specifier: 0.7.0
         version: 0.7.0
@@ -3652,20 +3649,6 @@ packages:
     resolution: {integrity: sha512-tVL6OrMe6UjqLosiE+EH9uxh2TQC0469GwF4tE014ugRaDDKKVWwFwZe0TBMlcyHKh5MD4ZxktWo/1hqUxIuhw==}
     engines: {node: '>=18.0.0'}
 
-  '@envelop/extended-validation@4.0.0':
-    resolution: {integrity: sha512-pvJ/OL+C+lpNiiCXezHT+vP3PTq37MQicoOB1l5MdgOOZZWRAp0NDOgvEKcXUY7AWNpvNHgSE0QFSRfGwsfwFQ==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      '@envelop/core': ^5.0.0
-      graphql: ^14.0.0 || ^15.0.0 || ^16.0.0
-
-  '@envelop/generic-auth@7.0.0':
-    resolution: {integrity: sha512-FxGzoSjIXJlv+aiVyhQ8oHoz41ol4gJe8KAzNX7FP3qrhldbrqcC5Q+J/VtNlo5jXYX0YuLHH6ehF80tQDZJ4Q==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      '@envelop/core': ^5.0.0
-      graphql: ^14.0.0 || ^15.0.0 || ^16.0.0
-
   '@envelop/graphql-jit@8.0.3':
     resolution: {integrity: sha512-IZnKc7dVOQV9jEi5s5RkG8fVKqc6Ss/mBN9PRt2iYFa9o6XkL/haPLJRfWFsS/CSJfFOQuzLyxYuALA8DaoOYw==}
     engines: {node: '>=18.0.0'}
@@ -19813,21 +19796,6 @@ snapshots:
       '@envelop/types': 5.0.0
       tslib: 2.7.0
 
-  '@envelop/extended-validation@4.0.0(@envelop/core@5.0.2)(graphql@16.9.0)':
-    dependencies:
-      '@envelop/core': 5.0.2
-      '@graphql-tools/utils': 10.5.4(graphql@16.9.0)
-      graphql: 16.9.0
-      tslib: 2.7.0
-
-  '@envelop/generic-auth@7.0.0(@envelop/core@5.0.2)(graphql@16.9.0)':
-    dependencies:
-      '@envelop/core': 5.0.2
-      '@envelop/extended-validation': 4.0.0(@envelop/core@5.0.2)(graphql@16.9.0)
-      '@graphql-tools/utils': 10.5.4(graphql@16.9.0)
-      graphql: 16.9.0
-      tslib: 2.7.0
-
   '@envelop/graphql-jit@8.0.3(@envelop/core@5.0.2)(graphql@16.9.0)':
     dependencies:
       '@envelop/core': 5.0.2
@@ -26408,16 +26376,6 @@ snapshots:
       postcss: 8.4.41
       postcss-value-parser: 4.2.0
 
-  autoprefixer@10.4.20(postcss@8.4.47):
-    dependencies:
-      browserslist: 4.23.3
-      caniuse-lite: 1.0.30001651
-      fraction.js: 4.3.7
-      normalize-range: 0.1.2
-      picocolors: 1.0.1
-      postcss: 8.4.47
-      postcss-value-parser: 4.2.0
-
   available-typed-arrays@1.0.5: {}
 
   avvio@8.3.0: