diff --git a/Essentials/src/net/ess3/settings/protect/Prevent.java b/Essentials/src/net/ess3/settings/protect/Prevent.java
index b2c571f1a..13710dcf2 100644
--- a/Essentials/src/net/ess3/settings/protect/Prevent.java
+++ b/Essentials/src/net/ess3/settings/protect/Prevent.java
@@ -17,7 +17,7 @@ public class Prevent implements StorageObject
 {
 	@Comment("Which blocks should a piston not be able to push?")
 	@ListType(Material.class)
-	private Set<Material> pistonPush = new HashSet<Material>();	
+	private Set<Material> pistonPush = new HashSet<Material>();
 	private boolean lavaFlow = false;
 	private boolean waterFlow = false;
 	// private boolean waterbucketFlow = false; TODO: Test if this still works
@@ -42,10 +42,16 @@ public class Prevent implements StorageObject
 	@MapKeyType(EntityType.class)
 	@MapValueType(Boolean.class)
 	private Map<EntityType, Boolean> spawn = new HashMap<EntityType, Boolean>();
-	
+
 	public Prevent()
 	{
-		spawn.put(EntityType.PIG, false);
+		for (EntityType t : EntityType.values())
+		{
+			if (t.isAlive())
+			{
+				spawn.put(t, false);
+			}			
+		}
 		pistonPush.add(Material.GLASS);
 	}
 }
\ No newline at end of file