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 8e1014a1da..95a260f9ba 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
@@ -32,7 +32,8 @@ import { DomainComponent } from '@home/pages/admin/oauth2/domains/domain.compone
 import { isEqual } from '@core/utils';
 import { DomainTableHeaderComponent } from '@home/pages/admin/oauth2/domains/domain-table-header.component';
 import { Direction } from '@app/shared/models/page/sort-order';
-import { map, mergeMap, Observable, of } from 'rxjs';
+import { map, of } from 'rxjs';
+import { switchMap } from 'rxjs/operators';
 
 @Injectable()
 export class DomainTableConfigResolver  {
@@ -84,16 +85,16 @@ export class DomainTableConfigResolver  {
     this.config.loadEntity = id => this.domainService.getDomainInfoById(id.id);
     this.config.saveEntity = (domain, originalDomain) => {
       const clientsIds = domain.oauth2ClientInfos as Array<string> || [];
-      let clientsTask: Observable<void>;
-      if (domain.id && !isEqual(domain.oauth2ClientInfos?.sort(),
-        originalDomain.oauth2ClientInfos?.map(info => info.id ? info.id.id : info).sort())) {
-        clientsTask = this.domainService.updateOauth2Clients(domain.id.id, clientsIds);
-      } else {
-        clientsTask = of(null);
-      }
       delete domain.oauth2ClientInfos;
-      return clientsTask.pipe(
-        mergeMap(() => this.domainService.saveDomain(domain, domain.id ? [] : clientsIds)),
+
+      return this.domainService.saveDomain(domain, domain.id ? [] : clientsIds).pipe(
+        switchMap(savedDomain => {
+          const shouldUpdateClients = domain.id && !isEqual(domain.oauth2ClientInfos?.sort(),
+            originalDomain.oauth2ClientInfos?.map(info => info.id ? info.id.id : info).sort());
+          return shouldUpdateClients
+            ? this.domainService.updateOauth2Clients(domain.id.id, clientsIds).pipe(map(() => savedDomain))
+            : of(savedDomain);
+        }),
         map(savedDomain => {
           (savedDomain as DomainInfo).oauth2ClientInfos = clientsIds;
           return savedDomain;