diff --git a/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/snippets/JavaSnippetCompletion.java b/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/snippets/JavaSnippetCompletion.java
index 0be2d8366..bf3eb74c2 100644
--- a/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/snippets/JavaSnippetCompletion.java
+++ b/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/snippets/JavaSnippetCompletion.java
@@ -76,6 +76,6 @@ public class JavaSnippetCompletion implements ICompletionProposal{
 
 		DocumentEdits edit = rewrite.createEdit(query.getDocument());
 
-		return Optional.of(edit);
+		return edit != null ?  Optional.of(edit) : Optional.empty();
 	}
 }