diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyAnnotations.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyAnnotations.kt
index 0753c42af28..4606e054a07 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyAnnotations.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyAnnotations.kt
@@ -83,11 +83,9 @@ class LazyAnnotationDescriptor(
 
     override val source = annotationEntry.toSourceElement()
 
-    private val scope = if (c.scope.ownerDescriptor is PackageFragmentDescriptor) {
-        LexicalScope.Base(c.scope, FileDescriptorForVisibilityChecks(source, c.scope.ownerDescriptor))
-    } else {
-        c.scope
-    }
+    private val scope = (c.scope.ownerDescriptor as? PackageFragmentDescriptor)?.let {
+        LexicalScope.Base(c.scope, FileDescriptorForVisibilityChecks(source, it))
+    } ?: c.scope
 
     override val allValueArguments by c.storageManager.createLazyValue {
         val resolutionResults = c.annotationResolver.resolveAnnotationCall(annotationEntry, scope, c.trace)
@@ -110,10 +108,9 @@ class LazyAnnotationDescriptor(
 
     private class FileDescriptorForVisibilityChecks(
         private val source: SourceElement,
-        private val containingDeclaration: DeclarationDescriptor
-    ) : DeclarationDescriptorWithSource {
+        private val containingDeclaration: PackageFragmentDescriptor
+    ) : DeclarationDescriptorWithSource, PackageFragmentDescriptor by containingDeclaration {
         override val annotations: Annotations get() = Annotations.EMPTY
-        override fun getContainingDeclaration() = containingDeclaration
         override fun getSource() = source
         override fun getOriginal() = this
         override fun getName() = Name.special("< file descriptor for annotation resolution >")
diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/LocalInAnnotation.kt b/compiler/testData/asJava/lightClasses/compilationErrors/LocalInAnnotation.kt
index df3c1c1a2d3..cbdd11d53a6 100644
--- a/compiler/testData/asJava/lightClasses/compilationErrors/LocalInAnnotation.kt
+++ b/compiler/testData/asJava/lightClasses/compilationErrors/LocalInAnnotation.kt
@@ -1,5 +1,4 @@
 // Validation
-// ALLOW_FRONTEND_EXCEPTION
 // See KT-24323
 // FIR_COMPARISON