diff --git a/src/Squidex/app/features/settings/pages/clients/client.component.ts b/src/Squidex/app/features/settings/pages/clients/client.component.ts
index b79373a14..fb38a791b 100644
--- a/src/Squidex/app/features/settings/pages/clients/client.component.ts
+++ b/src/Squidex/app/features/settings/pages/clients/client.component.ts
@@ -67,10 +67,6 @@ export class ClientComponent {
         this.clientsState.update(this.client, new UpdateAppClientDto(undefined, permission)).onErrorResumeNext().subscribe();
     }
 
-    public rename() {
-        this.clientsState.update(this.client, new UpdateAppClientDto(this.renameForm.controls['name'].value)).onErrorResumeNext().subscribe();
-    }
-
     public cancelRename() {
         this.isRenaming = false;
     }
@@ -87,6 +83,13 @@ export class ClientComponent {
         }
     }
 
+    public rename() {
+        this.clientsState.update(this.client, new UpdateAppClientDto(this.renameForm.controls['name'].value))
+            .subscribe(() => {
+                this.cancelRename();
+            });
+    }
+
     public createToken(client: AppClientDto) {
         this.appClientsService.createToken(this.appsState.appName, client)
             .subscribe(dto => {