diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/graphql/GraphQlAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/graphql/GraphQlAutoConfiguration.java
index e38602eda7..8d28e1093e 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/graphql/GraphQlAutoConfiguration.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/graphql/GraphQlAutoConfiguration.java
@@ -148,6 +148,12 @@ public class GraphQlAutoConfiguration {
 		return controllerConfigurer;
 	}
 
+	@Bean
+	DataFetcherExceptionResolver annotatedControllerConfigurerDataFetcherExceptionResolver(
+			AnnotatedControllerConfigurer annotatedControllerConfigurer) {
+		return annotatedControllerConfigurer.getExceptionResolver();
+	}
+
 	static class GraphQlResourcesRuntimeHints implements RuntimeHintsRegistrar {
 
 		@Override
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/GraphQlAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/GraphQlAutoConfigurationTests.java
index 908147d0bf..409193ba09 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/GraphQlAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/GraphQlAutoConfigurationTests.java
@@ -116,8 +116,10 @@ class GraphQlAutoConfigurationTests {
 			GraphQlSource graphQlSource = context.getBean(GraphQlSource.class);
 			GraphQL graphQL = graphQlSource.graphQl();
 			assertThat(graphQL.getQueryStrategy()).extracting("dataFetcherExceptionHandler")
-				.satisfies((exceptionHandler) -> assertThat(exceptionHandler.getClass().getName())
-					.endsWith("ExceptionResolversExceptionHandler"));
+				.satisfies((exceptionHandler) -> {
+					assertThat(exceptionHandler.getClass().getName()).endsWith("ExceptionResolversExceptionHandler");
+					assertThat(exceptionHandler).extracting("resolvers").asList().hasSize(2);
+				});
 		});
 	}