diff --git a/build-logic/convention/src/main/kotlin/com/nisrulz/example/spacexapi/ktx/AndroidComposeProjectExtensions.kt b/build-logic/convention/src/main/kotlin/com/nisrulz/example/spacexapi/ktx/AndroidComposeProjectExtensions.kt
index f87c9f5..ac9b7af 100644
--- a/build-logic/convention/src/main/kotlin/com/nisrulz/example/spacexapi/ktx/AndroidComposeProjectExtensions.kt
+++ b/build-logic/convention/src/main/kotlin/com/nisrulz/example/spacexapi/ktx/AndroidComposeProjectExtensions.kt
@@ -2,10 +2,10 @@ package com.nisrulz.example.spacexapi.ktx
 
 import com.android.build.api.dsl.LibraryExtension
 import org.gradle.api.Project
-import org.gradle.kotlin.dsl.assign
 import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.dependencies
 import org.jetbrains.kotlin.compose.compiler.gradle.ComposeCompilerGradlePluginExtension
+import org.jetbrains.kotlin.compose.compiler.gradle.ComposeFeatureFlag
 
 /**
  * Configure Compose-specific options
@@ -24,7 +24,13 @@ internal fun Project.configureAndroidCompose() = configure<LibraryExtension> {
     }
 
     extensions.configure<ComposeCompilerGradlePluginExtension> {
-        enableStrongSkippingMode = true
+        includeSourceInformation.set(true)
+        featureFlags.set(
+            setOf(
+                ComposeFeatureFlag.StrongSkipping.disabled(),
+                ComposeFeatureFlag.OptimizeNonSkippingGroups
+            )
+        )
     }
 }
 
@@ -32,7 +38,6 @@ internal fun Project.configureAndroidCompose() = configure<LibraryExtension> {
  * Configure Compose Navigation options
  */
 internal fun Project.configureAndroidComposeNavigation() = configure<LibraryExtension> {
-
     dependencies {
         add("implementation", catalogLibrary("navigation-compose"))
         add("implementation", catalogLibrary("kotlinx-serialization-json"))