diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DataFlowInspectionBase.java b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DataFlowInspectionBase.java
index f375f70b4e02..d98335648379 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DataFlowInspectionBase.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DataFlowInspectionBase.java
@@ -309,8 +309,10 @@ public class DataFlowInspectionBase extends AbstractBaseJavaLocalInspectionTool
         if (assignment != null) {
           Object constValue = ExpressionUtils.computeConstantExpression(assignment.getRExpression());
           if (constValue == PsiTypesUtil.getDefaultValue(expr.getType())) {
-            PsiElement target = ((PsiReferenceExpression)expr).resolve();
+            PsiReferenceExpression ref = (PsiReferenceExpression)expr;
+            PsiElement target = ref.resolve();
             if (target instanceof PsiField &&
+                (((PsiField)target).hasModifierProperty(PsiModifier.STATIC) || ExpressionUtils.isEffectivelyUnqualified(ref)) &&
                 ((PsiField)target).getContainingClass() == ((PsiClassInitializer)context).getContainingClass()) {
               return;
             }