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 6f735c3fd40..37a2b97c409 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
@@ -51,6 +51,7 @@ import org.springframework.graphql.data.method.annotation.support.AnnotatedContr
 import org.springframework.graphql.data.pagination.ConnectionFieldTypeVisitor;
 import org.springframework.graphql.data.pagination.CursorEncoder;
 import org.springframework.graphql.data.pagination.CursorStrategy;
+import org.springframework.graphql.data.pagination.EncodingCursorStrategy;
 import org.springframework.graphql.data.query.ScrollPositionCursorStrategy;
 import org.springframework.graphql.data.query.SliceConnectionAdapter;
 import org.springframework.graphql.data.query.WindowConnectionAdapter;
@@ -170,7 +171,7 @@ public class GraphQlAutoConfiguration {
 
 		@Bean
 		@ConditionalOnMissingBean
-		CursorStrategy<ScrollPosition> cursorStrategy() {
+		EncodingCursorStrategy<ScrollPosition> cursorStrategy() {
 			return CursorStrategy.withEncoder(new ScrollPositionCursorStrategy(), CursorEncoder.base64());
 		}
 
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 b39901b9745..0ba2700d054 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
@@ -44,7 +44,6 @@ import org.springframework.core.io.ByteArrayResource;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.graphql.ExecutionGraphQlService;
 import org.springframework.graphql.data.method.annotation.support.AnnotatedControllerConfigurer;
-import org.springframework.graphql.data.pagination.CursorStrategy;
 import org.springframework.graphql.data.pagination.EncodingCursorStrategy;
 import org.springframework.graphql.execution.BatchLoaderRegistry;
 import org.springframework.graphql.execution.DataFetcherExceptionResolver;
@@ -65,14 +64,11 @@ class GraphQlAutoConfigurationTests {
 
 	@Test
 	void shouldContributeDefaultBeans() {
-		this.contextRunner.run((context) -> {
-			assertThat(context).hasSingleBean(GraphQlSource.class)
-				.hasSingleBean(BatchLoaderRegistry.class)
-				.hasSingleBean(ExecutionGraphQlService.class)
-				.hasSingleBean(AnnotatedControllerConfigurer.class)
-				.hasSingleBean(CursorStrategy.class);
-			assertThat(context.getBean(CursorStrategy.class)).isInstanceOf(EncodingCursorStrategy.class);
-		});
+		this.contextRunner.run((context) -> assertThat(context).hasSingleBean(GraphQlSource.class)
+			.hasSingleBean(BatchLoaderRegistry.class)
+			.hasSingleBean(ExecutionGraphQlService.class)
+			.hasSingleBean(AnnotatedControllerConfigurer.class)
+			.hasSingleBean(EncodingCursorStrategy.class));
 	}
 
 	@Test