diff --git a/src/Identity/IdentityServer/ClientStore.cs b/src/Identity/IdentityServer/ClientStore.cs
index 1ba8896d4..c9b1595d6 100644
--- a/src/Identity/IdentityServer/ClientStore.cs
+++ b/src/Identity/IdentityServer/ClientStore.cs
@@ -96,6 +96,17 @@ public class ClientStore : IClientStore
             return null;
         }
 
+        switch (apiKey)
+        {
+            case ServiceAccountApiKeyDetails key:
+                var org = await _organizationRepository.GetByIdAsync(key.ServiceAccountOrganizationId);
+                if (!org.UseSecretsManager)
+                {
+                    return null;
+                }
+                break;
+        }
+
         var client = new Client
         {
             ClientId = clientId,