diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirStatusResolveTransformer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirStatusResolveTransformer.kt
index 44ca71b6a06..a0523d6bbf7 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirStatusResolveTransformer.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirStatusResolveTransformer.kt
@@ -345,7 +345,13 @@ abstract class AbstractFirStatusResolveTransformer(
              *   so we need to resolve supertypes of this class because they could
              *   come from kotlin sources
              */
+            val statusComputationStatus = statusComputationSession[regularClass]
+            if (!statusComputationStatus.requiresComputation) return
+
+            statusComputationSession.startComputing(regularClass)
             forceResolveStatusesOfSupertypes(regularClass)
+            statusComputationSession.endComputing(regularClass)
+
             return
         }
         if (regularClass.origin != FirDeclarationOrigin.Source) return