diff --git a/java/java-psi-api/src/com/intellij/codeInsight/AnnotationTargetUtil.java b/java/java-psi-api/src/com/intellij/codeInsight/AnnotationTargetUtil.java
index 154e05e12211..4b771c41781b 100644
--- a/java/java-psi-api/src/com/intellij/codeInsight/AnnotationTargetUtil.java
+++ b/java/java-psi-api/src/com/intellij/codeInsight/AnnotationTargetUtil.java
@@ -21,7 +21,7 @@ public final class AnnotationTargetUtil {
 
   public static final Set<TargetType> DEFAULT_TARGETS = ContainerUtil.immutableSet(
     TargetType.PACKAGE, TargetType.TYPE, TargetType.ANNOTATION_TYPE, TargetType.FIELD, TargetType.METHOD, TargetType.CONSTRUCTOR,
-    TargetType.PARAMETER, TargetType.LOCAL_VARIABLE);
+    TargetType.PARAMETER, TargetType.LOCAL_VARIABLE, TargetType.MODULE, TargetType.RECORD_COMPONENT);
 
   private static final TargetType[] PACKAGE_TARGETS = {TargetType.PACKAGE};
   private static final TargetType[] TYPE_USE_TARGETS = {TargetType.TYPE_USE};
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advFixture/module-info.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advFixture/module-info.java
new file mode 100644
index 000000000000..ada549d666f8
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advFixture/module-info.java
@@ -0,0 +1,2 @@
+@foo.A
+module Foo {}
\ No newline at end of file
diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/LightAdvHighlightingFixtureTest.java b/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/LightAdvHighlightingFixtureTest.java
index 9e56b3d8d6ef..c7d051d4163c 100644
--- a/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/LightAdvHighlightingFixtureTest.java
+++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/LightAdvHighlightingFixtureTest.java
@@ -211,6 +211,12 @@ public class LightAdvHighlightingFixtureTest extends LightJavaCodeInsightFixture
     doTest();
   }
 
+  public void testDefaultAnnotationsApplicability() {
+    myFixture.addClass("package foo; public @interface A {}");
+    myFixture.configureByFile("module-info.java");
+    myFixture.checkHighlighting();
+  }
+
   private void doTest() {
     myFixture.configureByFile(getTestName(false) + ".java");
     myFixture.checkHighlighting();