diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java
index 4c8d53375291..243103137edb 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java
@@ -2173,6 +2173,13 @@ public class HighlightUtil {
     }
     if ((resolved instanceof PsiLocalVariable || resolved instanceof PsiParameter) && !(resolved instanceof ImplicitVariable)) {
       highlightInfo = HighlightControlFlowUtil.checkVariableMustBeFinal((PsiVariable)resolved, ref);
+    } else if (resolved instanceof PsiClass) {
+      if (Comparing.strEqual(((PsiClass)resolved).getQualifiedName(), ((PsiClass)resolved).getName())) {
+        final PsiElement parent = ref.getParent();
+        if (parent instanceof PsiImportStaticReferenceElement || parent instanceof PsiImportStaticStatement) {
+          return HighlightInfo.createHighlightInfo(HighlightInfoType.WRONG_REF, refName, JavaErrorMessages.message("cannot.resolve.symbol", refName.getText()));
+        }
+      }
     }
     return highlightInfo;
   }
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/DefaultPackageClassInStaticImport.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/DefaultPackageClassInStaticImport.java
new file mode 100644
index 000000000000..43a1da2c223c
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/DefaultPackageClassInStaticImport.java
@@ -0,0 +1,11 @@
+import static <error descr="Cannot resolve symbol 'MyConstants'">MyConstants</error>.*;
+
+public class MyClient
+{
+    private int field = MyConstants.CONSTANT;
+}
+
+class MyConstants
+{
+    public static final int CONSTANT = 1;
+}
\ No newline at end of file
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/LightAdvHighlightingTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/LightAdvHighlightingTest.java
index 0fbc7173173f..8fac2b46da3c 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/LightAdvHighlightingTest.java
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/LightAdvHighlightingTest.java
@@ -175,6 +175,7 @@ public class LightAdvHighlightingTest extends LightDaemonAnalyzerTestCase {
   public void testIDEADEV13249() throws Exception { doTest(false, false); }
   public void testIDEADEV11919() throws Exception { doTest(false, false); }
   public void testMethodCannotBeApplied() throws Exception { doTest(false, false); }
+  public void testDefaultPackageClassInStaticImport() throws Exception { doTest(false, false); }
 
   public void testUnusedParamsOfPublicMethod() throws Exception { doTest(true, false); }