diff --git a/build-plugin/src/main/kotlin/thunderbird.library.android.gradle.kts b/build-plugin/src/main/kotlin/thunderbird.library.android.gradle.kts
index 6e875ba012c..5a866e83087 100644
--- a/build-plugin/src/main/kotlin/thunderbird.library.android.gradle.kts
+++ b/build-plugin/src/main/kotlin/thunderbird.library.android.gradle.kts
@@ -74,11 +74,6 @@ kotlin {
     compilerOptions {
         jvmTarget.set(ThunderbirdProjectConfig.Compiler.jvmTarget)
     }
-    sourceSets.all {
-        compilerOptions {
-            freeCompilerArgs.add("-Xwhen-guards")
-        }
-    }
 }
 
 dependencies {
diff --git a/feature/notification/api/build.gradle.kts b/feature/notification/api/build.gradle.kts
index e391c08e2f1..926d6575116 100644
--- a/feature/notification/api/build.gradle.kts
+++ b/feature/notification/api/build.gradle.kts
@@ -34,14 +34,6 @@ kotlin {
             implementation(libs.bundles.shared.jvm.test)
         }
     }
-
-    sourceSets.all {
-        compilerOptions {
-            freeCompilerArgs.addAll(
-                "-Xwhen-guards",
-            )
-        }
-    }
 }
 
 compose.resources {