diff --git a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/OIDCAuthenticationFilter.java b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/OIDCAuthenticationFilter.java
index 841252547..7e513fc0d 100644
--- a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/OIDCAuthenticationFilter.java
+++ b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/OIDCAuthenticationFilter.java
@@ -425,7 +425,10 @@ public class OIDCAuthenticationFilter extends AbstractAuthenticationProcessingFi
 						null, null);
 				SignedJWT jwt = new SignedJWT(header, claimsSet.build());
 
-				signer.signJwt(jwt, alg);
+				if (signer.getDefaultSignerKeyId() != null)
+					signer.signJwt(jwt);
+				else
+					signer.signJwt(jwt, alg);
 
 				form.add("client_assertion_type", "urn:ietf:params:oauth:client-assertion-type:jwt-bearer");
 				form.add("client_assertion", jwt.serialize());