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 56408acc1..6fd5c27cc 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
@@ -86,7 +86,7 @@ public class ConnectTokenEnhancer implements TokenEnhancer {
 
 		JWSAlgorithm signingAlg; 
 		JWSAlgorithm clientAlg = client.getIdTokenSignedResponseAlg().getAlgorithm();
-		if (clientAlg != JWSAlgorithm.NONE) {
+		if (clientAlg != null) {
 			signingAlg = clientAlg;
 		} else {
 			signingAlg = jwtService.getDefaultSigningAlgorithm();