diff --git a/buildSrc/src/main/java/Config.kt b/buildSrc/src/main/java/Config.kt
index 33d13ac7..3ebc6dd1 100644
--- a/buildSrc/src/main/java/Config.kt
+++ b/buildSrc/src/main/java/Config.kt
@@ -5,6 +5,8 @@ object Config {
     val kotlinStdLib = "stdlib-jdk8"
 
     val springBootVersion = "2.3.3.RELEASE"
+    // Spring is currently not compatible with Kotlin 1.4
+    val springKotlinCompatibleLanguageVersion = "1.3"
 
     object BuildPlugins {
         val androidGradle = "com.android.tools.build:gradle:4.0.1"
diff --git a/gradle.properties b/gradle.properties
index cce174a0..e93deafa 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -23,6 +23,9 @@ android.defaults.buildfeatures.aidl=false
 # disable Resource Values generation
 android.defaults.buildfeatures.resvalues=false
 
+# disable automatically adding Kotlin stdlib to compile dependencies
+kotlin.stdlib.default.dependency=false
+
 # TODO: Enable Prefab https://android-developers.googleblog.com/2020/02/native-dependencies-in-android-studio-40.html
 # android.enablePrefab=true
 # android.prefabVersion=1.0.0
diff --git a/sentry-spring-boot-starter/build.gradle.kts b/sentry-spring-boot-starter/build.gradle.kts
index 0ca7e13e..a2adf698 100644
--- a/sentry-spring-boot-starter/build.gradle.kts
+++ b/sentry-spring-boot-starter/build.gradle.kts
@@ -29,6 +29,7 @@ configure<JavaPluginConvention> {
 
 tasks.withType<KotlinCompile>().configureEach {
     kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString()
+    kotlinOptions.languageVersion = Config.springKotlinCompatibleLanguageVersion
 }
 
 dependencies {
diff --git a/sentry-spring/build.gradle.kts b/sentry-spring/build.gradle.kts
index d5038992..31d69e95 100644
--- a/sentry-spring/build.gradle.kts
+++ b/sentry-spring/build.gradle.kts
@@ -29,6 +29,7 @@ configure<JavaPluginConvention> {
 
 tasks.withType<KotlinCompile>().configureEach {
     kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString()
+    kotlinOptions.languageVersion = Config.springKotlinCompatibleLanguageVersion
 }
 
 dependencies {
diff --git a/sentry-test-support/build.gradle.kts b/sentry-test-support/build.gradle.kts
index f36a7174..fefac4ef 100644
--- a/sentry-test-support/build.gradle.kts
+++ b/sentry-test-support/build.gradle.kts
@@ -27,7 +27,7 @@ dependencies {
     compileOnly(Config.CompileOnly.jetbrainsAnnotations)
 
     // tests
-    api(kotlin(Config.kotlinStdLib))
+    implementation(kotlin(Config.kotlinStdLib))
     implementation(Config.TestLibs.kotlinTestJunit)
     implementation(Config.TestLibs.mockitoKotlin)
 }