diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/DomCreator.java b/xml/dom-impl/src/com/intellij/util/xml/impl/DomCreator.java
index 232ab1ad49f4..6062c1d60115 100644
--- a/xml/dom-impl/src/com/intellij/util/xml/impl/DomCreator.java
+++ b/xml/dom-impl/src/com/intellij/util/xml/impl/DomCreator.java
@@ -35,6 +35,7 @@ import com.intellij.util.xml.stubs.DomStub;
 import com.intellij.util.xml.stubs.ElementStub;
 import com.intellij.util.xml.stubs.FileStub;
 import com.intellij.xml.util.IncludedXmlTag;
+import com.intellij.xml.util.XmlUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -200,7 +201,7 @@ final class DomCreator {
     FileStub stub = null;
     DomFileMetaData meta = DomApplicationComponent.getInstance().findMeta(description);
     if (meta != null && meta.hasStubs() && file instanceof VirtualFileWithId && !isFileParsed(xmlFile)) {
-      if (FileBasedIndex.getInstance().getFileBeingCurrentlyIndexed() == null) {
+      if (FileBasedIndex.getInstance().getFileBeingCurrentlyIndexed() == null && !XmlUtil.isStubBuilding()) {
         ObjectStubTree<?> stubTree = StubTreeLoader.getInstance().readFromVFile(xmlFile.getProject(), file);
         if (stubTree != null) {
           stub = (FileStub)stubTree.getRoot();