diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-configuration.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-configuration.component.ts
index 1c65920179..3b2e0e9fc6 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-configuration.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-configuration.component.ts
@@ -619,6 +619,9 @@ export class GatewayConfigurationComponent implements OnInit {
         updateCredentials = true;
       } else {
         updateCredentials = this.initialCredentials.credentialsId !== securityConfig.accessToken;
+        if (updateCredentials) {
+          this.initialCredentials.credentialsId = securityConfig.accessToken;
+        }
       }
       if (updateCredentials) {
         newCredentials = {