diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/modifierLists/SymbolLightClassModifierList.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/modifierLists/SymbolLightClassModifierList.kt
index e114c8db6f4..7f7e097a8ee 100644
--- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/modifierLists/SymbolLightClassModifierList.kt
+++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/modifierLists/SymbolLightClassModifierList.kt
@@ -15,6 +15,4 @@ internal class SymbolLightClassModifierList<T : KtLightElement<KtModifierListOwn
     containingDeclaration: T,
     lazyModifiers: Lazy<Set<String>>,
     annotationsComputer: (PsiModifierList) -> List<PsiAnnotation>,
-) : SymbolLightModifierList<T>(containingDeclaration, lazyModifiers, annotationsComputer) {
-    override fun hasModifierProperty(name: String): Boolean = name in lazyModifiers.value
-}
+) : SymbolLightModifierList<T>(containingDeclaration, lazyModifiers, annotationsComputer)
diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/modifierLists/SymbolLightMemberModifierList.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/modifierLists/SymbolLightMemberModifierList.kt
index 36b4a0921b3..06048f09112 100644
--- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/modifierLists/SymbolLightMemberModifierList.kt
+++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/modifierLists/SymbolLightMemberModifierList.kt
@@ -25,7 +25,7 @@ internal class SymbolLightMemberModifierList<T : KtLightMember<*>>(
         // Pretend this method behaves like a `default` method
         name == PsiModifier.DEFAULT && isImplementationInInterface() -> true
         // TODO: FINAL && isPossiblyAffectedByAllOpen
-        else -> name in lazyModifiers.value
+        else -> super.hasModifierProperty(name)
     }
 
     private fun isImplementationInInterface(): Boolean {
diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/modifierLists/SymbolLightModifierList.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/modifierLists/SymbolLightModifierList.kt
index a7848208e9f..9cf2b35a07b 100644
--- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/modifierLists/SymbolLightModifierList.kt
+++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/modifierLists/SymbolLightModifierList.kt
@@ -21,12 +21,11 @@ import org.jetbrains.kotlin.psi.KtModifierListOwner
 
 internal abstract class SymbolLightModifierList<out T : KtLightElement<KtModifierListOwner, PsiModifierListOwner>>(
     protected val owner: T,
-    protected val lazyModifiers: Lazy<Set<String>>,
+    private val lazyModifiers: Lazy<Set<String>>,
     annotationsComputer: (PsiModifierList) -> List<PsiAnnotation>,
 ) : KtLightElementBase(owner), PsiModifierList, KtLightElement<KtModifierList, PsiModifierListOwner> {
     override val kotlinOrigin: KtModifierList? get() = owner.kotlinOrigin?.modifierList
     override fun getParent() = owner
-    override fun hasExplicitModifier(name: String) = hasModifierProperty(name)
     override fun setModifierProperty(name: String, value: Boolean) = cannotModify()
     override fun checkSetModifierProperty(name: String, value: Boolean) = throw IncorrectOperationException()
     override fun addAnnotation(qualifiedName: String): PsiAnnotation = cannotModify()
@@ -36,6 +35,7 @@ internal abstract class SymbolLightModifierList<out T : KtLightElement<KtModifie
     override fun toString() = "Light modifier list of $owner"
 
     override val givenAnnotations: List<KtLightAbstractAnnotation> get() = invalidAccess()
+
     private val lazyAnnotations: Lazy<List<PsiAnnotation>> = lazyPub {
         annotationsComputer(this)
     }
@@ -46,4 +46,7 @@ internal abstract class SymbolLightModifierList<out T : KtLightElement<KtModifie
 
     override fun equals(other: Any?): Boolean = this === other
     override fun hashCode(): Int = kotlinOrigin.hashCode()
+
+    override fun hasExplicitModifier(name: String) = hasModifierProperty(name)
+    override fun hasModifierProperty(name: String): Boolean = name in lazyModifiers.value
 }