diff --git a/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/completion/VscodeCompletionEngineAdapter.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/completion/VscodeCompletionEngineAdapter.java
index 7857c04ce..eb4418cff 100644
--- a/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/completion/VscodeCompletionEngineAdapter.java
+++ b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/completion/VscodeCompletionEngineAdapter.java
@@ -185,10 +185,12 @@ public class VscodeCompletionEngineAdapter implements VscodeCompletionEngine {
 		}
 		resolveEdits(doc, completion, item); //Warning. Its not allowed by LSP spec to resolveEdits
 											//lazy as we used to do in the past.
-		if (resolver!=null) {
-			item.setData(resolver.resolveLater(completion, doc));
-		} else {
-			resolveItem(doc, completion, item);
+		if (completion.getDocumentation() != null) {
+			if (resolver!=null) {
+				item.setData(resolver.resolveLater(completion, doc));
+			} else {
+				resolveItem(doc, completion, item);
+			}
 		}
 		return item;
 	}