diff --git a/src/lib/features/frontend-api/create-context.ts b/src/lib/features/frontend-api/create-context.ts
index 683d901941..921ca3f514 100644
--- a/src/lib/features/frontend-api/create-context.ts
+++ b/src/lib/features/frontend-api/create-context.ts
@@ -1,9 +1,7 @@
 // Copy of https://github.com/Unleash/unleash-proxy/blob/main/src/create-context.ts.
-
-/* eslint-disable prefer-object-spread */
+import crypto from 'crypto';
 import type { Context } from 'unleash-client';
 
-// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
 export function createContext(value: any): Context {
     const {
         appName,
@@ -33,9 +31,8 @@ export function createContext(value: any): Context {
     return cleanContext;
 }
 
-// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
 export const enrichContextWithIp = (query: any, ip: string): Context => {
     query.remoteAddress = query.remoteAddress || ip;
-    query.sessionId = query.sessionId || String(Math.random());
+    query.sessionId = query.sessionId || crypto.randomBytes(18).toString('hex');
     return createContext(query);
 };
diff --git a/src/lib/features/frontend-api/frontend-api-service.ts b/src/lib/features/frontend-api/frontend-api-service.ts
index 6761979938..ceace4dfdc 100644
--- a/src/lib/features/frontend-api/frontend-api-service.ts
+++ b/src/lib/features/frontend-api/frontend-api-service.ts
@@ -1,3 +1,4 @@
+import crypto from 'crypto';
 import type {
     IUnleashConfig,
     IUnleashServices,
@@ -88,7 +89,8 @@ export class FrontendApiService {
     ): Promise<FrontendApiFeatureSchema[]> {
         const client = await this.clientForFrontendApiToken(token);
         const definitions = client.getFeatureToggleDefinitions() || [];
-        const sessionId = context.sessionId || String(Math.random());
+        const sessionId =
+            context.sessionId || crypto.randomBytes(18).toString('hex');
 
         const resultDefinitions = definitions
             .filter((feature) =>
@@ -115,7 +117,8 @@ export class FrontendApiService {
     ): Promise<FrontendApiFeatureSchema[]> {
         const client = await this.newClientForFrontendApiToken(token);
         const definitions = client.getFeatureToggleDefinitions() || [];
-        const sessionId = context.sessionId || String(Math.random());
+        const sessionId =
+            context.sessionId || crypto.randomBytes(18).toString('hex');
 
         const resultDefinitions = definitions
             .filter((feature) => {