diff --git a/xml/impl/src/com/intellij/codeInsight/daemon/impl/tagTreeHighlighting/XmlTagTreeHighlightingPass.java b/xml/impl/src/com/intellij/codeInsight/daemon/impl/tagTreeHighlighting/XmlTagTreeHighlightingPass.java
index 6e7bc131bedd..9ad8d1a08b96 100644
--- a/xml/impl/src/com/intellij/codeInsight/daemon/impl/tagTreeHighlighting/XmlTagTreeHighlightingPass.java
+++ b/xml/impl/src/com/intellij/codeInsight/daemon/impl/tagTreeHighlighting/XmlTagTreeHighlightingPass.java
@@ -180,11 +180,11 @@ public class XmlTagTreeHighlightingPass extends TextEditorHighlightingPass {
         continue;
       }
 
-      if (pair.first != null) {
+      if (pair.first != null && !pair.first.isEmpty()) {
         highlightInfos.add(createHighlightInfo(color, pair.first));
       }
 
-      if (pair.second != null) {
+      if (pair.second != null && !pair.second.isEmpty()) {
         highlightInfos.add(createHighlightInfo(color, pair.second));
       }
 
@@ -192,7 +192,7 @@ public class XmlTagTreeHighlightingPass extends TextEditorHighlightingPass {
       final int end = pair.second != null ? pair.second.getEndOffset() : pair.first.getEndOffset();
 
       final Color lineMarkerColor = colorsForLineMarkers[i];
-      if (lineMarkerColor != null) {
+      if (lineMarkerColor != null && start != end) {
         final RangeHighlighter highlighter = createHighlighter(markupModel, new TextRange(start, end), lineMarkerColor);
         newHighlighters.add(highlighter);
       }