diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/CompilationDetails.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/CompilationDetails.kt
index ac85c445ed5..4c23f1c1d33 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/CompilationDetails.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/CompilationDetails.kt
@@ -266,8 +266,8 @@ open class DefaultCompilationDetails<T : KotlinCommonOptions>(
 
     override fun source(sourceSet: KotlinSourceSet) {
         if (directlyIncludedKotlinSourceSets.add(sourceSet)) {
-            target.project.whenEvaluated {
-                addExactSourceSetsEagerly(sourceSet.internal.withDependsOnClosure)
+            sourceSet.internal.withDependsOnClosure.forAll { inWithDependsOnClosure ->
+                addExactSourceSetEagerly(inWithDependsOnClosure)
             }
         }
     }
@@ -280,43 +280,41 @@ open class DefaultCompilationDetails<T : KotlinCommonOptions>(
             addAsCommonSources
         ) { sourceSet.kotlin }
 
-    internal fun addExactSourceSetsEagerly(sourceSets: Set<KotlinSourceSet>) {
+    internal fun addExactSourceSetEagerly(sourceSet: KotlinSourceSet) {
         with(target.project) {
             //TODO possibly issue with forced instantiation
-            sourceSets.forEach { sourceSet ->
-                addSourcesToCompileTask(
-                    sourceSet,
-                    addAsCommonSources = lazy {
-                        target.project.kotlinExtension.sourceSets.any { otherSourceSet ->
-                            sourceSet in otherSourceSet.dependsOn
-                        }
+            addSourcesToCompileTask(
+                sourceSet,
+                addAsCommonSources = lazy {
+                    target.project.kotlinExtension.sourceSets.any { otherSourceSet ->
+                        sourceSet in otherSourceSet.dependsOn
                     }
-                )
-
-                // Use `forced = false` since `api`, `implementation`, and `compileOnly` may be missing in some cases like
-                // old Java & Android projects:
-                addExtendsFromRelation(compilation.apiConfigurationName, sourceSet.apiConfigurationName, forced = false)
-                addExtendsFromRelation(
-                    compilation.implementationConfigurationName,
-                    sourceSet.implementationConfigurationName,
-                    forced = false
-                )
-                addExtendsFromRelation(compilation.compileOnlyConfigurationName, sourceSet.compileOnlyConfigurationName, forced = false)
-
-                if (compilation is KotlinCompilationToRunnableFiles<*>) {
-                    addExtendsFromRelation(compilation.runtimeOnlyConfigurationName, sourceSet.runtimeOnlyConfigurationName, forced = false)
                 }
+            )
 
-                if (sourceSet.name != defaultSourceSetName) {
-                    kotlinExtension.sourceSets.findByName(defaultSourceSetName)?.let { defaultSourceSet ->
-                        // Temporary solution for checking consistency across source sets participating in a compilation that may
-                        // not be interconnected with the dependsOn relation: check the settings as if the default source set of
-                        // the compilation depends on the one added to the compilation:
-                        defaultSourceSetLanguageSettingsChecker.runAllChecks(
-                            defaultSourceSet,
-                            sourceSet
-                        )
-                    }
+            // Use `forced = false` since `api`, `implementation`, and `compileOnly` may be missing in some cases like
+            // old Java & Android projects:
+            addExtendsFromRelation(compilation.apiConfigurationName, sourceSet.apiConfigurationName, forced = false)
+            addExtendsFromRelation(
+                compilation.implementationConfigurationName,
+                sourceSet.implementationConfigurationName,
+                forced = false
+            )
+            addExtendsFromRelation(compilation.compileOnlyConfigurationName, sourceSet.compileOnlyConfigurationName, forced = false)
+
+            if (compilation is KotlinCompilationToRunnableFiles<*>) {
+                addExtendsFromRelation(compilation.runtimeOnlyConfigurationName, sourceSet.runtimeOnlyConfigurationName, forced = false)
+            }
+
+            if (sourceSet.name != defaultSourceSetName) {
+                kotlinExtension.sourceSets.findByName(defaultSourceSetName)?.let { defaultSourceSet ->
+                    // Temporary solution for checking consistency across source sets participating in a compilation that may
+                    // not be interconnected with the dependsOn relation: check the settings as if the default source set of
+                    // the compilation depends on the one added to the compilation:
+                    defaultSourceSetLanguageSettingsChecker.runAllChecks(
+                        defaultSourceSet,
+                        sourceSet
+                    )
                 }
             }
         }
diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/metadata/KotlinMetadataTargetConfigurator.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/metadata/KotlinMetadataTargetConfigurator.kt
index 9c0dc80bec8..34a9c702d32 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/metadata/KotlinMetadataTargetConfigurator.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/metadata/KotlinMetadataTargetConfigurator.kt
@@ -316,7 +316,7 @@ class KotlinMetadataTargetConfigurator :
         return compilationFactory.create(compilationName).apply {
             target.compilations.add(this@apply)
 
-            (compilationDetails as DefaultCompilationDetails<*>).addExactSourceSetsEagerly(setOf(sourceSet))
+            (compilationDetails as DefaultCompilationDetails<*>).addExactSourceSetEagerly(sourceSet)
 
             configureMetadataDependenciesForCompilation(this@apply)