diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 839a5095dd..6ac84cfec2 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -203,7 +203,6 @@ dependencies {
     implementation(projects.appnav)
     anvil(projects.anvilcodegen)
 
-    coreLibraryDesugaring(libs.android.desugar)
     implementation(libs.appyx.core)
     implementation(libs.androidx.splash)
     implementation(libs.androidx.core)
diff --git a/libraries/pushstore/impl/build.gradle.kts b/libraries/pushstore/impl/build.gradle.kts
index 5946e77694..17e0268af1 100644
--- a/libraries/pushstore/impl/build.gradle.kts
+++ b/libraries/pushstore/impl/build.gradle.kts
@@ -55,6 +55,4 @@ dependencies {
     androidTestImplementation(libs.test.truth)
     androidTestImplementation(libs.test.runner)
     androidTestImplementation(projects.libraries.sessionStorage.test)
-
-    coreLibraryDesugaring(libs.android.desugar)
 }
diff --git a/libraries/session-storage/impl/build.gradle.kts b/libraries/session-storage/impl/build.gradle.kts
index 03de9acf86..cfbfa4c57d 100644
--- a/libraries/session-storage/impl/build.gradle.kts
+++ b/libraries/session-storage/impl/build.gradle.kts
@@ -45,8 +45,6 @@ dependencies {
     testImplementation(libs.test.turbine)
     testImplementation(libs.coroutines.test)
     testImplementation(libs.sqldelight.driver.jvm)
-
-    coreLibraryDesugaring(libs.android.desugar)
 }
 
 sqldelight {
diff --git a/plugins/src/main/kotlin/extension/CommonExtension.kt b/plugins/src/main/kotlin/extension/CommonExtension.kt
index e3f7b3682e..97305dbc66 100644
--- a/plugins/src/main/kotlin/extension/CommonExtension.kt
+++ b/plugins/src/main/kotlin/extension/CommonExtension.kt
@@ -31,7 +31,6 @@ fun CommonExtension<*, *, *, *, *>.androidConfig(project: Project) {
     }
 
     compileOptions {
-        isCoreLibraryDesugaringEnabled = true
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
diff --git a/plugins/src/main/kotlin/io.element.android-compose-application.gradle.kts b/plugins/src/main/kotlin/io.element.android-compose-application.gradle.kts
index af73409888..80bc0f884e 100644
--- a/plugins/src/main/kotlin/io.element.android-compose-application.gradle.kts
+++ b/plugins/src/main/kotlin/io.element.android-compose-application.gradle.kts
@@ -32,9 +32,13 @@ plugins {
 android {
     androidConfig(project)
     composeConfig(libs)
+    compileOptions {
+        isCoreLibraryDesugaringEnabled = true
+    }
 }
 
 dependencies {
     commonDependencies(libs)
     composeDependencies(libs)
+    coreLibraryDesugaring(libs.android.desugar)
 }
diff --git a/plugins/src/main/kotlin/io.element.android-compose-library.gradle.kts b/plugins/src/main/kotlin/io.element.android-compose-library.gradle.kts
index e420ab3c8d..3194505e4e 100644
--- a/plugins/src/main/kotlin/io.element.android-compose-library.gradle.kts
+++ b/plugins/src/main/kotlin/io.element.android-compose-library.gradle.kts
@@ -32,9 +32,13 @@ plugins {
 android {
     androidConfig(project)
     composeConfig(libs)
+    compileOptions {
+        isCoreLibraryDesugaringEnabled = true
+    }
 }
 
 dependencies {
     commonDependencies(libs)
     composeDependencies(libs)
+    coreLibraryDesugaring(libs.android.desugar)
 }
diff --git a/plugins/src/main/kotlin/io.element.android-library.gradle.kts b/plugins/src/main/kotlin/io.element.android-library.gradle.kts
index 6c3c77223c..f3a84031e6 100644
--- a/plugins/src/main/kotlin/io.element.android-library.gradle.kts
+++ b/plugins/src/main/kotlin/io.element.android-library.gradle.kts
@@ -29,8 +29,12 @@ plugins {
 
 android {
     androidConfig(project)
+    compileOptions {
+        isCoreLibraryDesugaringEnabled = true
+    }
 }
 
 dependencies {
     commonDependencies(libs)
+    coreLibraryDesugaring(libs.android.desugar)
 }
diff --git a/samples/minimal/build.gradle.kts b/samples/minimal/build.gradle.kts
index 1473bd7f93..016989a2d6 100644
--- a/samples/minimal/build.gradle.kts
+++ b/samples/minimal/build.gradle.kts
@@ -65,5 +65,4 @@ dependencies {
     implementation(projects.services.toolbox.impl)
     implementation(projects.libraries.featureflag.impl)
     implementation(libs.coroutines.core)
-    coreLibraryDesugaring(libs.android.desugar)
 }