diff --git a/CHANGELOG.md b/CHANGELOG.md
index 96fddffb2a..57dda3b18d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,10 @@
     - `SentryAttribute.stringAttribute()` takes a `String` value
   - We opted for handling parameters via `SentryLogParameters` to avoid creating tons of overloads that are ambiguous.
 
+### Dependencies
+
+- Bump Spring Boot to `3.5.0` ([#4111](https://github.com/getsentry/sentry-java/pull/4111))
+
 ## 8.12.0
 
 ### Features
diff --git a/buildSrc/src/main/java/Config.kt b/buildSrc/src/main/java/Config.kt
index 441adc9834..13757de622 100644
--- a/buildSrc/src/main/java/Config.kt
+++ b/buildSrc/src/main/java/Config.kt
@@ -6,7 +6,7 @@ object Config {
     val kotlinStdLib = "stdlib-jdk8"
 
     val springBootVersion = "2.7.18"
-    val springBoot3Version = "3.4.2"
+    val springBoot3Version = "3.5.0"
     val kotlinCompatibleLanguageVersion = "1.6"
 
     val androidComposeCompilerVersion = "1.5.14"
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 0c4bbdad32..c75e60b121 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -9,7 +9,7 @@ kotlin = "1.9.24"
 # see https://developer.android.com/jetpack/androidx/releases/compose-kotlin
 okhttp = "4.9.2"
 springTwo = "2.7.18"
-springThree = "3.4.2"
+springThree = "3.5.0"
 targetSdk = "34"
 compileSdk = "34"
 minSdk = "21"
diff --git a/sentry-samples/sentry-samples-spring-boot-jakarta/src/main/java/io/sentry/samples/spring/boot/jakarta/graphql/TaskCreatorController.java b/sentry-samples/sentry-samples-spring-boot-jakarta/src/main/java/io/sentry/samples/spring/boot/jakarta/graphql/TaskCreatorController.java
index cb6677c0c3..434a482208 100644
--- a/sentry-samples/sentry-samples-spring-boot-jakarta/src/main/java/io/sentry/samples/spring/boot/jakarta/graphql/TaskCreatorController.java
+++ b/sentry-samples/sentry-samples-spring-boot-jakarta/src/main/java/io/sentry/samples/spring/boot/jakarta/graphql/TaskCreatorController.java
@@ -20,6 +20,7 @@ public TaskCreatorController(final BatchLoaderRegistry batchLoaderRegistry) {
     // using mapped BatchLoader to not have to deal with correct ordering of items
     batchLoaderRegistry
         .forTypePair(String.class, ProjectController.Creator.class)
+        .withOptions((builder) -> builder.setBatchingEnabled(true))
         .registerMappedBatchLoader(
             (Set<String> keys, BatchLoaderEnvironment env) -> {
               return Mono.fromCallable(
diff --git a/sentry-spring-jakarta/src/main/java/io/sentry/spring/jakarta/graphql/SentryBatchLoaderRegistry.java b/sentry-spring-jakarta/src/main/java/io/sentry/spring/jakarta/graphql/SentryBatchLoaderRegistry.java
index e31c6a725d..a75aa28134 100644
--- a/sentry-spring-jakarta/src/main/java/io/sentry/spring/jakarta/graphql/SentryBatchLoaderRegistry.java
+++ b/sentry-spring-jakarta/src/main/java/io/sentry/spring/jakarta/graphql/SentryBatchLoaderRegistry.java
@@ -76,7 +76,7 @@ public BatchLoaderRegistry.RegistrationSpec<K, V> withName(String name) {
 
     @Override
     public BatchLoaderRegistry.RegistrationSpec<K, V> withOptions(
-        Consumer<DataLoaderOptions> optionsConsumer) {
+        Consumer<DataLoaderOptions.Builder> optionsConsumer) {
       return delegate.withOptions(optionsConsumer);
     }
 
diff --git a/sentry-spring-jakarta/src/test/kotlin/io/sentry/spring/jakarta/graphql/SentrySpringSubscriptionHandlerTest.kt b/sentry-spring-jakarta/src/test/kotlin/io/sentry/spring/jakarta/graphql/SentrySpringSubscriptionHandlerTest.kt
index c2ebb95e48..243dc9d949 100644
--- a/sentry-spring-jakarta/src/test/kotlin/io/sentry/spring/jakarta/graphql/SentrySpringSubscriptionHandlerTest.kt
+++ b/sentry-spring-jakarta/src/test/kotlin/io/sentry/spring/jakarta/graphql/SentrySpringSubscriptionHandlerTest.kt
@@ -1,4 +1,4 @@
-package io.sentry.spring.graphql
+package io.sentry.spring.jakarta.graphql
 
 import graphql.execution.instrumentation.parameters.InstrumentationFieldFetchParameters
 import graphql.language.Document
@@ -6,9 +6,9 @@ import graphql.language.OperationDefinition
 import graphql.schema.DataFetchingEnvironment
 import io.sentry.IScopes
 import io.sentry.graphql.ExceptionReporter
-import io.sentry.spring.jakarta.graphql.SentrySpringSubscriptionHandler
 import org.junit.jupiter.api.assertThrows
 import org.mockito.kotlin.anyOrNull
+import org.mockito.kotlin.check
 import org.mockito.kotlin.mock
 import org.mockito.kotlin.same
 import org.mockito.kotlin.verify
@@ -40,10 +40,10 @@ class SentrySpringSubscriptionHandlerTest {
 
         verify(exceptionReporter).captureThrowable(
             same(exception),
-            org.mockito.kotlin.check {
+            check {
                 assertEquals(true, it.isSubscription)
                 assertSame(scopes, it.scopes)
-                assertEquals("query testQuery\n", it.query)
+                assertEquals("query testQuery \n", it.query)
             },
             anyOrNull()
         )
@@ -69,10 +69,10 @@ class SentrySpringSubscriptionHandlerTest {
 
         verify(exceptionReporter).captureThrowable(
             same(exception),
-            org.mockito.kotlin.check {
+            check {
                 assertEquals(true, it.isSubscription)
                 assertSame(scopes, it.scopes)
-                assertEquals("query testQuery\n", it.query)
+                assertEquals("query testQuery \n", it.query)
             },
             anyOrNull()
         )