diff --git a/ui-ngx/src/app/modules/home/pages/admin/oauth2/domains/domain-table-config.resolver.ts b/ui-ngx/src/app/modules/home/pages/admin/oauth2/domains/domain-table-config.resolver.ts
index 39f4b5cce3..a3cc535d62 100644
--- a/ui-ngx/src/app/modules/home/pages/admin/oauth2/domains/domain-table-config.resolver.ts
+++ b/ui-ngx/src/app/modules/home/pages/admin/oauth2/domains/domain-table-config.resolver.ts
@@ -87,8 +87,8 @@ export class DomainTableConfigResolver implements Resolve<EntityTableConfig<Doma
     this.config.entitiesFetchFunction = pageLink => this.domainService.getTenantDomainInfos(pageLink);
     this.config.loadEntity = id => this.domainService.getDomainInfoById(id.id);
     this.config.saveEntity = (domain, originalDomain) => {
-      const clientsIds = domain.oauth2ClientInfos as Array<string>;
-      if (domain.id && !isEqual(domain.oauth2ClientInfos.sort(), originalDomain.oauth2ClientInfos.map(info => info.id.id).sort())) {
+      const clientsIds = domain.oauth2ClientInfos as Array<string> || [];
+      if (domain.id && !isEqual(domain.oauth2ClientInfos?.sort(), originalDomain.oauth2ClientInfos?.map(info => info.id.id).sort())) {
         this.domainService.updateOauth2Clients(domain.id.id, clientsIds).subscribe();
       }
       delete domain.oauth2ClientInfos;
diff --git a/ui-ngx/src/app/modules/home/pages/admin/oauth2/mobile-apps/mobile-app-table-config.resolver.ts b/ui-ngx/src/app/modules/home/pages/admin/oauth2/mobile-apps/mobile-app-table-config.resolver.ts
index 96bd222ed5..b4c6c7576d 100644
--- a/ui-ngx/src/app/modules/home/pages/admin/oauth2/mobile-apps/mobile-app-table-config.resolver.ts
+++ b/ui-ngx/src/app/modules/home/pages/admin/oauth2/mobile-apps/mobile-app-table-config.resolver.ts
@@ -93,8 +93,8 @@ export class MobileAppTableConfigResolver implements Resolve<EntityTableConfig<M
     this.config.entitiesFetchFunction = pageLink => this.mobileAppService.getTenantMobileAppInfos(pageLink);
     this.config.loadEntity = id => this.mobileAppService.getMobileAppInfoById(id.id);
     this.config.saveEntity = (mobileApp, originalMobileApp) => {
-      const clientsIds = mobileApp.oauth2ClientInfos as Array<string>;
-      if (mobileApp.id && !isEqual(mobileApp.oauth2ClientInfos.sort(), originalMobileApp.oauth2ClientInfos.map(info => info.id.id).sort())) {
+      const clientsIds = mobileApp.oauth2ClientInfos as Array<string> || [];
+      if (mobileApp.id && !isEqual(mobileApp.oauth2ClientInfos?.sort(), originalMobileApp.oauth2ClientInfos?.map(info => info.id.id).sort())) {
         this.mobileAppService.updateOauth2Clients(mobileApp.id.id, clientsIds).subscribe();
       }
       delete mobileApp.oauth2ClientInfos;