diff --git a/src/main/java/com/commafeed/frontend/model/Entry.java b/src/main/java/com/commafeed/frontend/model/Entry.java
index 20296281..1370f240 100644
--- a/src/main/java/com/commafeed/frontend/model/Entry.java
+++ b/src/main/java/com/commafeed/frontend/model/Entry.java
@@ -77,10 +77,12 @@ public class Entry implements Serializable {
 		content.setValue(getContent());
 		entry.setContents(Arrays.<SyndContent> asList(content));
 
-		SyndEnclosureImpl enclosure = new SyndEnclosureImpl();
-		enclosure.setType(getEnclosureType());
-		enclosure.setUrl(getEnclosureUrl());
-		entry.setEnclosures(Arrays.<SyndEnclosure> asList(enclosure));
+		if (getEnclosureUrl() != null) {
+			SyndEnclosureImpl enclosure = new SyndEnclosureImpl();
+			enclosure.setType(getEnclosureType());
+			enclosure.setUrl(getEnclosureUrl());
+			entry.setEnclosures(Arrays.<SyndEnclosure> asList(enclosure));
+		}
 
 		entry.setLink(getUrl());
 		entry.setPublishedDate(getDate());