diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/overrides/FakeOverrideBuilderStrategy.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/overrides/FakeOverrideBuilderStrategy.kt
index 7b2a9e33417..0a057d907de 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/overrides/FakeOverrideBuilderStrategy.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/overrides/FakeOverrideBuilderStrategy.kt
@@ -109,15 +109,10 @@ private fun isInFriendModules(
     toModule: ModuleDescriptor,
     friendModules: Map<String, Collection<String>>,
 ): Boolean {
-    if (friendModules.isEmpty()) return false
-
     val fromModuleName = fromModule.name.asStringStripSpecialMarkers()
-
-    val fromFriends = friendModules[fromModuleName] ?: return false
-
     val toModuleName = toModule.name.asStringStripSpecialMarkers()
 
-    return toModuleName in fromFriends
+    return fromModuleName == toModuleName || friendModules[fromModuleName]?.contains(toModuleName) == true
 }
 
 fun buildFakeOverrideMember(
diff --git a/compiler/testData/codegen/box/javaInterop/syntheticPropClashingWithJvmField.kt b/compiler/testData/codegen/box/javaInterop/syntheticPropClashingWithJvmField.kt
index 200f1d68364..36174bbcfc0 100644
--- a/compiler/testData/codegen/box/javaInterop/syntheticPropClashingWithJvmField.kt
+++ b/compiler/testData/codegen/box/javaInterop/syntheticPropClashingWithJvmField.kt
@@ -1,5 +1,4 @@
 // TARGET_BACKEND: JVM
-// IGNORE_CODEGEN_WITH_IR_FAKE_OVERRIDE_GENERATION: KT-61805
 // WITH_STDLIB
 // ISSUE: KT-56538