diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ex/InspectionRVContentProviderImpl.java b/platform/lang-impl/src/com/intellij/codeInspection/ex/InspectionRVContentProviderImpl.java
index 01a27855fce9..62132d59866a 100644
--- a/platform/lang-impl/src/com/intellij/codeInspection/ex/InspectionRVContentProviderImpl.java
+++ b/platform/lang-impl/src/com/intellij/codeInspection/ex/InspectionRVContentProviderImpl.java
@@ -131,9 +131,7 @@ public class InspectionRVContentProviderImpl extends InspectionRVContentProvider
           assert problem != null;
           elemNode
             .insertByOrder(ReadAction.compute(() -> new ProblemDescriptionNode(refElement, problem, toolWrapper, presentation)), true);
-          if (problems.length == 1) {
-            elemNode.setProblem(problems[0]);
-          }
+          elemNode.setProblem(elemNode.getChildCount() == 1 ? problems[0] : null);
         }
     }
     else {
diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ui/RefElementNode.java b/platform/lang-impl/src/com/intellij/codeInspection/ui/RefElementNode.java
index a92de6a639e9..bb92904bef59 100644
--- a/platform/lang-impl/src/com/intellij/codeInspection/ui/RefElementNode.java
+++ b/platform/lang-impl/src/com/intellij/codeInspection/ui/RefElementNode.java
@@ -102,7 +102,7 @@ public class RefElementNode extends SuppressableInspectionTreeNode {
     return super.insertByOrder(child, allowDuplication);
   }
 
-  public void setProblem(@NotNull CommonProblemDescriptor descriptor) {
+  public void setProblem(CommonProblemDescriptor descriptor) {
     mySingleDescriptor = descriptor;
   }