diff --git a/gateways/KonSoft.InternalGateway/Extensions/YarpSwaggerUIBuilderExtensions.cs b/gateways/KonSoft.InternalGateway/Extensions/YarpSwaggerUIBuilderExtensions.cs
index b5bb755..12248f0 100644
--- a/gateways/KonSoft.InternalGateway/Extensions/YarpSwaggerUIBuilderExtensions.cs
+++ b/gateways/KonSoft.InternalGateway/Extensions/YarpSwaggerUIBuilderExtensions.cs
@@ -27,6 +27,8 @@ namespace KonSoft.InternalGateway.Extensions
                     .ToList();
                 var gatewayUrl = configuration["GatewayUrl"];
 
+                options.OAuthClientId(configuration["AuthServer:SwaggerClientId"]);
+                options.OAuthClientSecret(configuration["AuthServer:SwaggerClientSecret"]);
                 foreach (var clusterGroup in groupedClusters)
                 {
                     var routeConfig = yarpConfig.Routes.FirstOrDefault(q =>
@@ -39,8 +41,6 @@ namespace KonSoft.InternalGateway.Extensions
                     
                    // options.SwaggerEndpoint($"{clusterGroup.Value.Address}/swagger/v1/swagger.json", $"{routeConfig.RouteId} API");
                     options.SwaggerEndpoint(new Uri(new Uri(!string.IsNullOrWhiteSpace(gatewayUrl)? gatewayUrl: clusterGroup.Value.Address), $"{routeConfig.RouteId.Split("-")[0]}/swagger/v1/swagger.json").AbsoluteUri, $"{routeConfig.RouteId} API");
-                    options.OAuthClientId(configuration["AuthServer:SwaggerClientId"]);
-                    options.OAuthClientSecret(configuration["AuthServer:SwaggerClientSecret"]);
                 }
             });