diff --git a/packages/nocodb-nest/src/modules/api-tokens/api-tokens.service.ts b/packages/nocodb-nest/src/modules/api-tokens/api-tokens.service.ts
index b051d508f1..565042d981 100644
--- a/packages/nocodb-nest/src/modules/api-tokens/api-tokens.service.ts
+++ b/packages/nocodb-nest/src/modules/api-tokens/api-tokens.service.ts
@@ -6,6 +6,7 @@ import { NcError } from '../../helpers/catchError';
 import { ApiToken } from '../../models';
 import type { User } from '../../models';
 import type { ApiTokenReqType } from 'nocodb-sdk';
+import extractRolesObj from '../../utils/extractRolesObj'
 
 @Injectable()
 export class ApiTokensService {
@@ -28,7 +29,7 @@ export class ApiTokensService {
   async apiTokenDelete(param: { token; user: User }) {
     const apiToken = await ApiToken.getByToken(param.token);
     if (
-      !param.user.roles.includes(OrgUserRoles.SUPER_ADMIN) &&
+      !extractRolesObj(param.user.roles)[OrgUserRoles.SUPER_ADMIN] &&
       apiToken.fk_user_id !== param.user.id
     ) {
       NcError.notFound('Token not found');
diff --git a/packages/nocodb-nest/src/modules/org-tokens/ee/org-tokens/org-tokens-ee.service.ts b/packages/nocodb-nest/src/modules/org-tokens/ee/org-tokens/org-tokens-ee.service.ts
index fb9a1da1b0..8760321099 100644
--- a/packages/nocodb-nest/src/modules/org-tokens/ee/org-tokens/org-tokens-ee.service.ts
+++ b/packages/nocodb-nest/src/modules/org-tokens/ee/org-tokens/org-tokens-ee.service.ts
@@ -3,6 +3,7 @@ import { OrgUserRoles } from 'nocodb-sdk';
 import { PagedResponseImpl } from '../../../../helpers/PagedResponse';
 import { ApiToken } from '../../../../models';
 import type { UserType } from 'nocodb-sdk';
+import extractRolesObj from '../../../../utils/extractRolesObj'
 
 @Injectable()
 export class OrgTokensEeService {
@@ -10,7 +11,7 @@ export class OrgTokensEeService {
     let fk_user_id = param.user.id;
 
     // if super admin get all tokens
-    if (param.user.roles.includes(OrgUserRoles.SUPER_ADMIN)) {
+    if (extractRolesObj(param.user.roles)[OrgUserRoles.SUPER_ADMIN]) {
       fk_user_id = undefined;
     }
 
diff --git a/packages/nocodb-nest/src/modules/org-tokens/org-tokens.service.ts b/packages/nocodb-nest/src/modules/org-tokens/org-tokens.service.ts
index 1bb2f79fc0..2cd97a5f3e 100644
--- a/packages/nocodb-nest/src/modules/org-tokens/org-tokens.service.ts
+++ b/packages/nocodb-nest/src/modules/org-tokens/org-tokens.service.ts
@@ -7,13 +7,14 @@ import { PagedResponseImpl } from '../../helpers/PagedResponse';
 import { ApiToken } from '../../models';
 import type { User } from '../../models';
 import type { ApiTokenReqType } from 'nocodb-sdk';
+import extractRolesObj from '../../utils/extractRolesObj'
 
 @Injectable()
 export class OrgTokensService {
   async apiTokenList(param: { user: User; query: any }) {
     const fk_user_id = param.user.id;
     let includeUnmappedToken = false;
-    if (param.user.roles.includes(OrgUserRoles.SUPER_ADMIN)) {
+    if (extractRolesObj(param.user.roles)[OrgUserRoles.SUPER_ADMIN]) {
       includeUnmappedToken = true;
     }
 
@@ -50,7 +51,7 @@ export class OrgTokensService {
     const fk_user_id = param.user.id;
     const apiToken = await ApiToken.getByToken(param.token);
     if (
-      !param.user.roles.includes(OrgUserRoles.SUPER_ADMIN) &&
+      !extractRolesObj(param.user.roles)[OrgUserRoles.SUPER_ADMIN] &&
       apiToken.fk_user_id !== fk_user_id
     ) {
       NcError.notFound('Token not found');
diff --git a/packages/nocodb-nest/src/modules/org-users/org-users.service.ts b/packages/nocodb-nest/src/modules/org-users/org-users.service.ts
index 9fd49c7d79..fc99efe904 100644
--- a/packages/nocodb-nest/src/modules/org-users/org-users.service.ts
+++ b/packages/nocodb-nest/src/modules/org-users/org-users.service.ts
@@ -16,6 +16,7 @@ import { randomTokenString } from '../../helpers/stringHelpers';
 import { Audit, ProjectUser, Store, SyncSource, User } from '../../models';
 
 import Noco from '../../Noco';
+import extractRolesObj from '../../utils/extractRolesObj'
 import { MetaTable } from '../../utils/globals';
 import { ProjectUsersService } from '../project-users/project-users.service';
 import type { UserType } from 'nocodb-sdk';
@@ -42,7 +43,7 @@ export class OrgUsersService {
 
     const user = await User.get(param.userId);
 
-    if (user.roles.includes(OrgUserRoles.SUPER_ADMIN)) {
+    if (extractRolesObj(user.roles)[OrgUserRoles.SUPER_ADMIN]) {
       NcError.badRequest('Cannot update super admin roles');
     }
 
@@ -57,7 +58,7 @@ export class OrgUsersService {
     try {
       const user = await User.get(param.userId, ncMeta);
 
-      if (user.roles.includes(OrgUserRoles.SUPER_ADMIN)) {
+      if (extractRolesObj(user.roles)[OrgUserRoles.SUPER_ADMIN]) {
         NcError.badRequest('Cannot delete super admin');
       }