diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirHelpers.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirHelpers.kt
index 7ce2f17043d..2b5a7f6f0d4 100644
--- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirHelpers.kt
+++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirHelpers.kt
@@ -288,12 +288,12 @@ private fun FirDeclaration.hasBody(): Boolean = when (this) {
  */
 fun FirClass<*>.findNonInterfaceSupertype(context: CheckerContext): FirTypeRef? {
     for (it in superTypeRefs) {
-        val classId = it.safeAs<FirResolvedTypeRef>()
+        val lookupTag = it.safeAs<FirResolvedTypeRef>()
             ?.type.safeAs<ConeClassLikeType>()
-            ?.lookupTag?.classId
+            ?.lookupTag
             ?: continue
 
-        val fir = context.session.firSymbolProvider.getClassLikeSymbolByFqName(classId)
+        val fir = lookupTag.toSymbol(context.session)
             ?.fir.safeAs<FirClass<*>>()
             ?: continue