diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/token/ConnectTokenEnhancer.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/token/ConnectTokenEnhancer.java
index 6fd5c27cc..27f2dcaef 100644
--- a/openid-connect-server/src/main/java/org/mitre/openid/connect/token/ConnectTokenEnhancer.java
+++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/token/ConnectTokenEnhancer.java
@@ -84,12 +84,9 @@ public class ConnectTokenEnhancer implements TokenEnhancer {
 
 		claims.setJWTID(UUID.randomUUID().toString()); // set a random NONCE in the middle of it
 
-		JWSAlgorithm signingAlg; 
-		JWSAlgorithm clientAlg = client.getIdTokenSignedResponseAlg().getAlgorithm();
-		if (clientAlg != null) {
-			signingAlg = clientAlg;
-		} else {
-			signingAlg = jwtService.getDefaultSigningAlgorithm();
+		JWSAlgorithm signingAlg = jwtService.getDefaultSigningAlgorithm();
+		if (client.getIdTokenSignedResponseAlg() != null) {
+			signingAlg = client.getIdTokenSignedResponseAlg().getAlgorithm();
 		}
 		
 		SignedJWT signed = new SignedJWT(new JWSHeader(signingAlg), claims);