diff --git a/build.gradle b/build.gradle
index 3f76b752..df219144 100644
--- a/build.gradle
+++ b/build.gradle
@@ -42,7 +42,7 @@ configure(moduleProjects) {
 			mavenBom "org.junit:junit-bom:5.7.2"
 		}
 		dependencies {
-			dependency 'com.graphql-java:graphql-java:17.0-beta1'
+			dependency 'com.graphql-java:graphql-java:0.0.0-2021-07-21T06-48-56-713bb637'
 			dependency 'org.assertj:assertj-core:3.19.0'
 			dependencySet(group: 'org.apache.logging.log4j', version: '2.14.1') {
 				entry 'log4j-api'
diff --git a/graphql-spring-boot-starter/build.gradle b/graphql-spring-boot-starter/build.gradle
index ed53a1d3..65c6c498 100644
--- a/graphql-spring-boot-starter/build.gradle
+++ b/graphql-spring-boot-starter/build.gradle
@@ -24,7 +24,7 @@ dependencyManagement {
 
 dependencies {
 	api project(':spring-graphql')
-	api 'com.graphql-java:graphql-java:0.0.0-2021-07-06T01-36-09-02444b78'
+	api 'com.graphql-java:graphql-java:0.0.0-2021-07-21T06-48-56-713bb637'
 	api 'io.projectreactor:reactor-core'
 	api 'org.springframework:spring-context'
 	api 'org.springframework.boot:spring-boot-starter'
diff --git a/spring-graphql/src/main/java/org/springframework/graphql/execution/DefaultGraphQlSourceBuilder.java b/spring-graphql/src/main/java/org/springframework/graphql/execution/DefaultGraphQlSourceBuilder.java
index 63772b69..c0970942 100644
--- a/spring-graphql/src/main/java/org/springframework/graphql/execution/DefaultGraphQlSourceBuilder.java
+++ b/spring-graphql/src/main/java/org/springframework/graphql/execution/DefaultGraphQlSourceBuilder.java
@@ -138,13 +138,13 @@ class DefaultGraphQlSourceBuilder implements GraphQlSource.Builder {
 		List<GraphQLTypeVisitor> visitors = new ArrayList<>(this.typeVisitors);
 		visitors.add(ContextDataFetcherDecorator.TYPE_VISITOR);
 
-		GraphQLCodeRegistry.Builder builder = GraphQLCodeRegistry.newCodeRegistry(schema.getCodeRegistry());
-		Map<Class<?>, Object> vars = Collections.singletonMap(GraphQLCodeRegistry.Builder.class, builder);
+		GraphQLCodeRegistry.Builder codeRegistry = GraphQLCodeRegistry.newCodeRegistry(schema.getCodeRegistry());
+		Map<Class<?>, Object> vars = Collections.singletonMap(GraphQLCodeRegistry.Builder.class, codeRegistry);
 
 		SchemaTraverser traverser = new SchemaTraverser();
 		traverser.depthFirstFullSchema(visitors, schema, vars);
 
-		return GraphQLSchema.newSchema(schema).codeRegistry(builder.build()).build();
+		return schema.transformWithoutTypes(builder -> builder.codeRegistry(codeRegistry));
 	}