diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirVisibilityQualifierChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirVisibilityQualifierChecker.kt
index 30672ba7cfa..7745bfceceb 100644
--- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirVisibilityQualifierChecker.kt
+++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirVisibilityQualifierChecker.kt
@@ -10,17 +10,18 @@ import org.jetbrains.kotlin.diagnostics.DiagnosticReporter
 import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext
 import org.jetbrains.kotlin.fir.analysis.checkers.isStandalone
 import org.jetbrains.kotlin.fir.analysis.diagnostics.toInvisibleReferenceDiagnostic
-import org.jetbrains.kotlin.fir.declarations.FirTypeAlias
-import org.jetbrains.kotlin.fir.declarations.fullyExpandedClass
-import org.jetbrains.kotlin.fir.declarations.utils.expandedConeType
+import org.jetbrains.kotlin.fir.declarations.*
 import org.jetbrains.kotlin.fir.expressions.FirErrorResolvedQualifier
 import org.jetbrains.kotlin.fir.expressions.FirResolvedQualifier
+import org.jetbrains.kotlin.fir.firForVisibilityChecker
 import org.jetbrains.kotlin.fir.getOwnerLookupTag
 import org.jetbrains.kotlin.fir.resolve.diagnostics.ConeVisibilityError
 import org.jetbrains.kotlin.fir.resolve.toSymbol
-import org.jetbrains.kotlin.fir.symbols.SymbolInternals
 import org.jetbrains.kotlin.fir.symbols.impl.FirClassLikeSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirRegularClassSymbol
+import org.jetbrains.kotlin.fir.symbols.impl.FirTypeAliasSymbol
+import org.jetbrains.kotlin.fir.types.ConeClassLikeType
+import org.jetbrains.kotlin.fir.types.coneTypeSafe
 import org.jetbrains.kotlin.fir.types.toSymbol
 import org.jetbrains.kotlin.fir.visibilityChecker
 
@@ -29,7 +30,6 @@ object FirVisibilityQualifierChecker : FirResolvedQualifierChecker() {
         checkClassLikeSymbol(expression.symbol ?: return, expression, expression.isStandalone(context), context, reporter)
     }
 
-    @OptIn(SymbolInternals::class)
     private fun checkClassLikeSymbol(
         symbol: FirClassLikeSymbol<*>,
         expression: FirResolvedQualifier,
@@ -38,13 +38,13 @@ object FirVisibilityQualifierChecker : FirResolvedQualifierChecker() {
         reporter: DiagnosticReporter,
     ) {
         val firFile = context.containingFile ?: return
-        val firClassLikeDeclaration = symbol.fir
 
         // Note: errors on implicit receiver are already reported in coneDiagnosticToFirDiagnostic
         // See e.g. diagnostics/tests/visibility/packagePrivateStaticViaInternal.fir.kt
         if (expression.source?.kind != KtFakeSourceElementKind.ImplicitReceiver &&
             !context.session.visibilityChecker.isClassLikeVisible(
-                firClassLikeDeclaration, context.session, firFile, context.containingDeclarations,
+                symbol.firForVisibilityChecker,
+                context.session, firFile, context.containingDeclarations,
             )
         ) {
             if (expression !is FirErrorResolvedQualifier || expression.diagnostic !is ConeVisibilityError) {
@@ -67,8 +67,8 @@ object FirVisibilityQualifierChecker : FirResolvedQualifierChecker() {
             }
         }
 
-        if (firClassLikeDeclaration is FirTypeAlias) {
-            firClassLikeDeclaration.expandedConeType?.toSymbol(context.session)?.let {
+        if (symbol is FirTypeAliasSymbol) {
+            symbol.resolvedExpandedTypeRef.coneTypeSafe<ConeClassLikeType>()?.toSymbol(context.session)?.let {
                 checkClassLikeSymbol(it, expression, isStandalone, context, reporter)
             }
         }
@@ -78,11 +78,12 @@ object FirVisibilityQualifierChecker : FirResolvedQualifierChecker() {
         }
     }
 
-    @OptIn(SymbolInternals::class)
     private fun FirRegularClassSymbol.toInvisibleCompanion(context: CheckerContext): FirRegularClassSymbol? {
         val firFile = context.containingFile ?: return null
         return companionObjectSymbol?.takeIf {
-            !context.session.visibilityChecker.isClassLikeVisible(it.fir, context.session, firFile, context.containingDeclarations)
+            !context.session.visibilityChecker.isClassLikeVisible(
+                it.firForVisibilityChecker, context.session, firFile, context.containingDeclarations,
+            )
         }
     }
 }
diff --git a/compiler/fir/providers/src/org/jetbrains/kotlin/fir/FirVisibilityChecker.kt b/compiler/fir/providers/src/org/jetbrains/kotlin/fir/FirVisibilityChecker.kt
index 70dd10069e8..c8c77fd85b5 100644
--- a/compiler/fir/providers/src/org/jetbrains/kotlin/fir/FirVisibilityChecker.kt
+++ b/compiler/fir/providers/src/org/jetbrains/kotlin/fir/FirVisibilityChecker.kt
@@ -24,6 +24,7 @@ import org.jetbrains.kotlin.fir.resolve.providers.symbolProvider
 import org.jetbrains.kotlin.fir.symbols.ConeClassLikeLookupTag
 import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.*
+import org.jetbrains.kotlin.fir.symbols.lazyResolveToPhase
 import org.jetbrains.kotlin.fir.types.*
 import org.jetbrains.kotlin.fir.utils.exceptions.withFirEntry
 import org.jetbrains.kotlin.name.FqName
@@ -546,3 +547,12 @@ private fun FirClassLikeDeclaration.containingNonLocalClass(session: FirSession)
         is FirTypeAlias -> null
     }
 }
+
+/**
+ * The returned fir can be passed to the visibility checker, but don't
+ * use it for anything else.
+ */
+val <D, S : FirBasedSymbol<out D>> S.firForVisibilityChecker: D
+    get() = fir.also {
+        lazyResolveToPhase(FirResolvePhase.STATUS)
+    }