diff --git a/src/Core/IdentityServer/CustomTokenRequestValidator.cs b/src/Core/IdentityServer/CustomTokenRequestValidator.cs
index 375c6c6d1a..1e076af5a2 100644
--- a/src/Core/IdentityServer/CustomTokenRequestValidator.cs
+++ b/src/Core/IdentityServer/CustomTokenRequestValidator.cs
@@ -44,7 +44,8 @@ namespace Bit.Core.IdentityServer
         public async Task ValidateAsync(CustomTokenRequestValidationContext context)
         {
             string[] allowedGrantTypes = { "authorization_code", "client_credentials" };
-            if (!allowedGrantTypes.Contains(context.Result.ValidatedRequest.GrantType))
+            if (!allowedGrantTypes.Contains(context.Result.ValidatedRequest.GrantType) ||
+                context.Result.ValidatedRequest.ClientId.StartsWith("organization"))
             {
                 return;
             }