diff --git a/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/snippet/SchemaBasedSnippetGenerator.java b/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/snippet/SchemaBasedSnippetGenerator.java
index b4b00431f..39a1d263b 100644
--- a/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/snippet/SchemaBasedSnippetGenerator.java
+++ b/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/snippet/SchemaBasedSnippetGenerator.java
@@ -72,7 +72,7 @@ public class SchemaBasedSnippetGenerator implements TypeBasedSnippetProvider {
 	}
 
 	private void generateBeanSnippet(List<YTypedProperty> props, SnippetBuilder builder, int indent, int nestingLimit) {
-		if (nestingLimit>0) {
+		if (nestingLimit>0 && !props.isEmpty()) {
 			boolean first = true;
 			for (YTypedProperty p : props) {
 				if (!first) {