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 6c8176ba7..6aa62e9f2 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
@@ -419,7 +419,7 @@ public class SpringIndexerJava implements SpringIndexer {
 		CachedBean[] beans;
 		CachedDiagnostics[] diagnostics;
 
-		if (cachedSymbols == null || cachedBeans == null) {
+		if (cachedSymbols == null || cachedBeans == null || cachedDiagnostics == null ) {
 			List<CachedSymbol> generatedSymbols = new ArrayList<CachedSymbol>();
 			List<CachedBean> generatedBeans = new ArrayList<CachedBean>();
 			List<CachedDiagnostics> generatedDiagnostics = new ArrayList<CachedDiagnostics>();