diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringIndexer.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringIndexer.java
index 6fcc91fba..3679b10d3 100644
--- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringIndexer.java
+++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringIndexer.java
@@ -276,7 +276,8 @@ public class SpringIndexer {
 
 	public List<SymbolInformation> getAllSymbols(String query) {
 		if (query != null && query.length() > 0) {
-			return searchMatchingSymbols(this.symbols, query);
+			List<SymbolInformation> foundSymbols = searchMatchingSymbols(this.symbols, query);
+			return foundSymbols.subList(0,  Math.min(50, foundSymbols.size()));
 		} else {
 			return this.symbols.subList(0, Math.min(50, this.symbols.size()));
 		}