diff --git a/pom.xml b/pom.xml
index c1cd09e..3fb8db5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>texmex</groupId>
 	<artifactId>burrito</artifactId>
-	<version>0.2.5-SNAPSHOT</version>
+	<version>0.2.6-SNAPSHOT</version>
 	<distributionManagement>
 		<repository>
 			<id>releases</id>
diff --git a/src/main/java/burrito/client/crud/widgets/EnumIndexedListWidget.java b/src/main/java/burrito/client/crud/widgets/EnumIndexedListWidget.java
index fa57d08..52c190d 100644
--- a/src/main/java/burrito/client/crud/widgets/EnumIndexedListWidget.java
+++ b/src/main/java/burrito/client/crud/widgets/EnumIndexedListWidget.java
@@ -1,6 +1,7 @@
 package burrito.client.crud.widgets;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import burrito.client.crud.CrudService;
@@ -74,7 +75,10 @@ private void createFields(List<String> enumValues) {
 
 	public void setValue(List<String> value) {
 		startValue = value;
-
+		if(startValue == null) {
+			startValue = Collections.emptyList();
+		}
+		
 		renderStartValue();
 	}