diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/AddIntransitiveMetadataDependency.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/AddIntransitiveMetadataDependency.kt
index c9eb528cdda..3bbbf72da86 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/AddIntransitiveMetadataDependency.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/AddIntransitiveMetadataDependency.kt
@@ -19,9 +19,8 @@ import org.jetbrains.kotlin.gradle.plugin.sources.internal
  * In this mode, every source set will receive exactly one commonized library to analyze its source code with.
  */
 internal fun Project.addIntransitiveMetadataDependencyIfPossible(sourceSet: DefaultKotlinSourceSet, dependency: FileCollection) {
-    if (project.isIntransitiveMetadataConfigurationEnabled) {
-        project.dependencies.add(sourceSet.intransitiveMetadataConfigurationName, dependency)
-    } /*else {
-        project.dependencies.add(sourceSet.internal.resolvableMetadataConfiguration.name, dependency)
-    }*/
+    val dependencyConfigurationName =
+        if (project.isIntransitiveMetadataConfigurationEnabled) sourceSet.intransitiveMetadataConfigurationName
+        else sourceSet.implementationMetadataConfigurationName
+    project.dependencies.add(dependencyConfigurationName, dependency)
 }
diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/KotlinNativePlatformDependencies.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/KotlinNativePlatformDependencies.kt
index 872b8fca337..a2e0a7b84d5 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/KotlinNativePlatformDependencies.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/KotlinNativePlatformDependencies.kt
@@ -96,8 +96,11 @@ private fun Project.addDependencies(
         }
     }
 
-    if (isIdeDependency && sourceSet is DefaultKotlinSourceSet && project.isIntransitiveMetadataConfigurationEnabled) {
-        dependencies.add(sourceSet.intransitiveMetadataConfigurationName, libraries)
+    if (isIdeDependency && sourceSet is DefaultKotlinSourceSet) {
+        val metadataConfigurationName =
+            if (project.isIntransitiveMetadataConfigurationEnabled) sourceSet.intransitiveMetadataConfigurationName
+            else sourceSet.implementationMetadataConfigurationName
+        dependencies.add(metadataConfigurationName, libraries)
     }
 }