diff --git a/analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/implUtils.kt b/analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/implUtils.kt
index 8e3f13ccc5e..4e523fd499b 100644
--- a/analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/implUtils.kt
+++ b/analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/implUtils.kt
@@ -13,24 +13,11 @@ import com.intellij.util.IncorrectOperationException
 import org.jetbrains.kotlin.analyzer.KotlinModificationTrackerService
 import org.jetbrains.kotlin.psi.*
 
-fun KtSuperTypeList.findEntry(fqNameToFind: String): KtSuperTypeListEntry? {
-    val name = fqNameToFind.substringAfterLast(delimiter = '.', missingDelimiterValue = "")
-    if (name.isEmpty()) {
-        return entries.find { it.typeAsUserType?.textMatches(fqNameToFind) == true }
-    }
+fun KtSuperTypeList.findEntry(fqNameToFind: String): KtSuperTypeListEntry? =
+    entries.find { it.typeAsUserType?.simpleName == fqNameToFind }
 
-    val qualifier = fqNameToFind.substringBeforeLast('.')
-    val entries = entries.mapNotNull { entry -> entry.typeAsUserType?.let { entry to it } }
-        .filter { (_, type) -> type.referencedName == name && (type.qualifier?.textMatches(qualifier) != false) }
-        .ifEmpty { return null }
-
-    return if (entries.size == 1) {
-        entries.first().first
-    } else {
-        val entry = entries.firstOrNull { it.second.qualifier != null } ?: entries.firstOrNull()
-        entry?.first
-    }
-}
+private val KtUserType.simpleName: String?
+    get() = qualifier?.let { "${it.simpleName}.$referencedName" } ?: referencedName
 
 // NOTE: avoid using blocking lazy in light classes, it leads to deadlocks
 fun <T> lazyPub(initializer: () -> T) = lazy(LazyThreadSafetyMode.PUBLICATION, initializer)
diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesByPsiForLibraryTestGenerated.java b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesByPsiForLibraryTestGenerated.java
index 16cea2b574f..b45f1877ced 100644
--- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesByPsiForLibraryTestGenerated.java
+++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesByPsiForLibraryTestGenerated.java
@@ -300,6 +300,12 @@ public class SymbolLightClassesByPsiForLibraryTestGenerated extends AbstractSymb
         runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/typealiasInTypeArguments.kt");
     }
 
+    @Test
+    @TestMetadata("unresolvedGenericSupertypes.kt")
+    public void testUnresolvedGenericSupertypes() throws Exception {
+        runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/unresolvedGenericSupertypes.kt");
+    }
+
     @Test
     @TestMetadata("unresolvedWithAliasedImport.kt")
     public void testUnresolvedWithAliasedImport() throws Exception {
diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesByPsiForSourceTestGenerated.java b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesByPsiForSourceTestGenerated.java
index 3ad46bfb136..235803ff675 100644
--- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesByPsiForSourceTestGenerated.java
+++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesByPsiForSourceTestGenerated.java
@@ -300,6 +300,12 @@ public class SymbolLightClassesByPsiForSourceTestGenerated extends AbstractSymbo
         runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/typealiasInTypeArguments.kt");
     }
 
+    @Test
+    @TestMetadata("unresolvedGenericSupertypes.kt")
+    public void testUnresolvedGenericSupertypes() throws Exception {
+        runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/unresolvedGenericSupertypes.kt");
+    }
+
     @Test
     @TestMetadata("unresolvedWithAliasedImport.kt")
     public void testUnresolvedWithAliasedImport() throws Exception {
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/unresolvedGenericSupertypes.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/unresolvedGenericSupertypes.java
new file mode 100644
index 00000000000..61c11087e0a
--- /dev/null
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/unresolvedGenericSupertypes.java
@@ -0,0 +1,7 @@
+public final class C1 /* C1*/ extends Super<T, U> implements Intf1<A, B>, Intf2<X, Y<Z>> {
+  public  C1();//  .ctor()
+}
+
+public final class C2 /* C2*/ extends com.example.Super<T, U> implements com.example.Intf1<A, B>, com.example.Intf2<X, Y<Z>> {
+  public  C2();//  .ctor()
+}
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/unresolvedGenericSupertypes.kt b/compiler/testData/asJava/lightClasses/lightClassByPsi/unresolvedGenericSupertypes.kt
new file mode 100644
index 00000000000..4de903fcb93
--- /dev/null
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/unresolvedGenericSupertypes.kt
@@ -0,0 +1,9 @@
+public class C1: Intf1 < A , B >, Super < T , U >(42),
+    Intf2 < X ,
+            Y < Z >>
+
+public class C2: com . example . Intf1 < A , B >, com . example . Super < T , U >(42),
+    com . example . Intf2 < X ,
+            Y < Z >>
+
+// COMPILATION_ERRORS
\ No newline at end of file