diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringIndexerJava.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringIndexerJava.java
index ce2d004485..630d9d10f2 100644
--- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringIndexerJava.java
+++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringIndexerJava.java
@@ -777,6 +777,7 @@ public void accept(ReconcileProblem problem) {
 			if (!context.isFullAst()) {
 				// Let problems be found in the next pass, don't add the problems to the aggregate problems collector to not duplicate them with the next pass
 				context.getNextPassFiles().add(context.getFile());
+				context.resetDocumentRelatedElements(context.getDocURI());
 			} else {
 				problemCollector.endCollecting();
 				log.error("Complete AST required but it is complete already. Parsing ", context.getDocURI());