diff --git a/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleLanguageServer.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleLanguageServer.java
index 91ea2cad2..ae98d46b8 100644
--- a/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleLanguageServer.java
+++ b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleLanguageServer.java
@@ -126,7 +126,11 @@ public abstract class SimpleLanguageServer implements LanguageServer, LanguageCl
 	}
 
 	public SnippetBuilder createSnippetBuilder() {
-		return new SnippetBuilder();
+		if (hasCompletionSnippetSupport) {
+			return new SnippetBuilder();
+		} else {
+			return SnippetBuilder.gimped();
+		}
 	}
 
 	public SimpleLanguageServer(String extensionId) {