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 32a86210b..d274c641b 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
@@ -191,11 +191,12 @@ public class SpringIndexerJava implements SpringIndexer {
 		if (updatedDocs != null) {
 			DocumentDescriptor[] docs = filterDocuments(project, updatedDocs);
 
-			for (DocumentDescriptor updatedDoc : docs) {
-				this.symbolHandler.removeSymbols(project, updatedDoc.getDocURI());
+			if (docs.length > 0) {
+				for (DocumentDescriptor updatedDoc : docs) {
+					this.symbolHandler.removeSymbols(project, updatedDoc.getDocURI());
+				}
+				scanFiles(project, docs);
 			}
-
-			scanFiles(project, docs);
 		}
 	}