diff --git a/apps/api-gateway/src/authz/jwt.strategy.ts b/apps/api-gateway/src/authz/jwt.strategy.ts
index 683bc08ac..5ea90b943 100644
--- a/apps/api-gateway/src/authz/jwt.strategy.ts
+++ b/apps/api-gateway/src/authz/jwt.strategy.ts
@@ -55,8 +55,12 @@ export class JwtStrategy extends PassportStrategy(Strategy) {
   async validate(payload: JwtPayload): Promise<object> {
 
     let userDetails = null;
+    let userInfo;
 
-    const userInfo = await this.usersService.getUserByUserIdInKeycloak(payload.email);
+    if (payload?.email) {
+      userInfo = await this.usersService.getUserByUserIdInKeycloak(payload?.email);
+    }
+    
     if (payload.hasOwnProperty('client_id')) {
       const orgDetails: IOrganization = await this.organizationService.findOrganizationOwner(payload['client_id']);