diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/web/ClientAPI.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/web/ClientAPI.java
index 7d924f14d..9f9f4e0ae 100644
--- a/openid-connect-server/src/main/java/org/mitre/openid/connect/web/ClientAPI.java
+++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/web/ClientAPI.java
@@ -608,7 +608,7 @@ public class ClientAPI {
 								newClient.setJwksUri(claimSet.getStringClaim(claim));
 								break;
 							case JWKS:
-								newClient.setJwks(JWKSet.parse(claimSet.getStringClaim(claim)));
+								newClient.setJwks(JWKSet.parse(claimSet.getJSONObjectClaim(claim).toJSONString()));
 								break;
 							case POLICY_URI:
 								newClient.setPolicyUri(claimSet.getStringClaim(claim));
diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/web/DynamicClientRegistrationEndpoint.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/web/DynamicClientRegistrationEndpoint.java
index f99e5cc66..c95dca545 100644
--- a/openid-connect-server/src/main/java/org/mitre/openid/connect/web/DynamicClientRegistrationEndpoint.java
+++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/web/DynamicClientRegistrationEndpoint.java
@@ -688,7 +688,7 @@ public class DynamicClientRegistrationEndpoint {
 								newClient.setJwksUri(claimSet.getStringClaim(claim));
 								break;
 							case JWKS:
-								newClient.setJwks(JWKSet.parse(claimSet.getStringClaim(claim)));
+								newClient.setJwks(JWKSet.parse(claimSet.getJSONObjectClaim(claim).toJSONString()));
 								break;
 							case POLICY_URI:
 								newClient.setPolicyUri(claimSet.getStringClaim(claim));