diff --git a/src/engine/tools/shared/nixopus-client.ts b/src/engine/tools/shared/nixopus-client.ts
index c3ff4c6..c0752e0 100644
--- a/src/engine/tools/shared/nixopus-client.ts
+++ b/src/engine/tools/shared/nixopus-client.ts
@@ -13,6 +13,7 @@ export function createNixopusClient(requestContext?: NixopusRequestContext) {
   const token = requestContext?.get?.('authToken') || config.authToken;
   const cookies = requestContext?.get?.('cookies');
   const orgId = requestContext?.get?.('organizationId');
+  const userId = requestContext?.get?.('userId');
 
   const headers: Record<string, string> = {
     'Content-Type': 'application/json',
@@ -29,6 +30,9 @@ export function createNixopusClient(requestContext?: NixopusRequestContext) {
   if (orgId) {
     headers['X-Organization-Id'] = orgId;
   }
+  if (userId) {
+    headers['X-User-Id'] = userId as string;
+  }
 
   return createClient({
     baseUrl: API_BASE_URL,