diff --git a/autoconfigure/src/main/java/io/mzlnk/springframework/multitenant/oauth2/resourceserver/resolver/jwt/JwtAuthenticationManagerResolver.java b/autoconfigure/src/main/java/io/mzlnk/springframework/multitenant/oauth2/resourceserver/resolver/jwt/JwtAuthenticationManagerResolver.java
index 8cd81c8..44f8a15 100644
--- a/autoconfigure/src/main/java/io/mzlnk/springframework/multitenant/oauth2/resourceserver/resolver/jwt/JwtAuthenticationManagerResolver.java
+++ b/autoconfigure/src/main/java/io/mzlnk/springframework/multitenant/oauth2/resourceserver/resolver/jwt/JwtAuthenticationManagerResolver.java
@@ -42,12 +42,14 @@ public static class Builder {
         private AuthenticationManagerResolver<HttpServletRequest> trustedIssuerResolver;
 
         public Builder withPublicKeyResolver(Map<String, RSAPublicKey> publicKeys) {
-            this.publicKeyResolver = new JwtIssuerAuthenticationManagerResolver(new PublicKeyJwtAuthenticationManagerResolver(publicKeys));
+            if (publicKeys != null && !publicKeys.isEmpty())
+                this.publicKeyResolver = new JwtIssuerAuthenticationManagerResolver(new PublicKeyJwtAuthenticationManagerResolver(publicKeys));
             return this;
         }
 
         public Builder withTrustedIssuerResolver(Collection<String> trustedIssuers) {
-            this.trustedIssuerResolver = new JwtIssuerAuthenticationManagerResolver(trustedIssuers);
+            if (trustedIssuers != null && !trustedIssuers.isEmpty())
+                this.trustedIssuerResolver = new JwtIssuerAuthenticationManagerResolver(trustedIssuers);
             return this;
         }