diff --git a/Management/Security/ClientAuthMiddleware.cs b/Management/Security/ClientAuthMiddleware.cs
index 148be16..22633db 100644
--- a/Management/Security/ClientAuthMiddleware.cs
+++ b/Management/Security/ClientAuthMiddleware.cs
@@ -277,7 +277,11 @@ public sealed class ClientAuthMiddleware
             var validationParams = new TokenValidationParameters
             {
                 ValidateIssuer    = true,
-                ValidIssuers      = new[] { $"{instance.TrimEnd('/')}/{tenantId}/v2.0" },
+                ValidIssuers      = new[]
+                {
+                    $"https://login.microsoftonline.com/{tenantId}/v2.0",
+                    $"https://sts.windows.net/{tenantId}/"
+                },
                 ValidateAudience  = true,
                 ValidAudiences    = new[] { clientId, $"api://{clientId}" },
                 ValidateLifetime  = true,