diff --git a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlTagValueImpl.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlTagValueImpl.java
index 45c5373a225c..b82c55b49d93 100644
--- a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlTagValueImpl.java
+++ b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlTagValueImpl.java
@@ -57,10 +57,10 @@ public class XmlTagValueImpl implements XmlTagValue{
   public XmlText[] getTextElements() {
     XmlText[] textElements = myTextElements;
     if(textElements != null) return textElements;
-    myTextElements = Arrays.stream(myElements)
+    textElements = Arrays.stream(myElements)
       .filter(element -> element instanceof XmlText)
       .map(element -> (XmlText)element).toArray(XmlText[]::new);
-    return myTextElements;
+    return myTextElements = textElements.length == 0 ? XmlText.EMPTY_ARRAY : textElements;
   }
 
   @Override