diff --git a/console/src/app/modules/user-grants/user-grants.component.html b/console/src/app/modules/user-grants/user-grants.component.html
index 6d786294d..f559b6843 100644
--- a/console/src/app/modules/user-grants/user-grants.component.html
+++ b/console/src/app/modules/user-grants/user-grants.component.html
@@ -107,8 +107,8 @@
 
       <ng-container matColumnDef="org">
         <th mat-header-cell *matHeaderCellDef>{{ 'PROJECT.GRANT.ORG' | translate }}</th>
-        <td mat-cell *matCellDef="let grant">
-          {{ grant.grantedOrgName }}
+        <td mat-cell *cnslCellDef="let grant; dataSource: dataSource">
+          {{ 'grantedOrgName' in grant && grant.grantedOrgName ? grant.grantedOrgName : grant.orgName }}
         </td>
       </ng-container>
 
diff --git a/console/src/app/modules/user-grants/user-grants.module.ts b/console/src/app/modules/user-grants/user-grants.module.ts
index d076ec28a..96372c611 100644
--- a/console/src/app/modules/user-grants/user-grants.module.ts
+++ b/console/src/app/modules/user-grants/user-grants.module.ts
@@ -11,6 +11,7 @@ import { MatTooltipModule } from '@angular/material/tooltip';
 import { RouterModule } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
 import { HasRoleModule } from 'src/app/directives/has-role/has-role.module';
+import { TypeSafeCellDefModule } from 'src/app/directives/type-safe-cell-def/type-safe-cell-def.module';
 import { HasRolePipeModule } from 'src/app/pipes/has-role-pipe/has-role-pipe.module';
 import { LocalizedDatePipeModule } from 'src/app/pipes/localized-date-pipe/localized-date-pipe.module';
 import { TimestampToDatePipeModule } from 'src/app/pipes/timestamp-to-date-pipe/timestamp-to-date-pipe.module';
@@ -55,6 +56,7 @@ import { UserGrantsComponent } from './user-grants.component';
     LocalizedDatePipeModule,
     InputModule,
     WarnDialogModule,
+    TypeSafeCellDefModule,
   ],
   exports: [UserGrantsComponent],
 })