diff --git a/src/main/java/com/commafeed/backend/services/FeedUpdateService.java b/src/main/java/com/commafeed/backend/services/FeedUpdateService.java
index f2d8c28a..0602aea3 100644
--- a/src/main/java/com/commafeed/backend/services/FeedUpdateService.java
+++ b/src/main/java/com/commafeed/backend/services/FeedUpdateService.java
@@ -61,7 +61,10 @@ public class FeedUpdateService {
 			if (foundEntry == null) {
 				FeedEntryContent content = entry.getContent();
 				content.setContent(handleContent(content.getContent()));
-				content.setTitle(handleContent(content.getTitle()));
+
+				String title = handleContent(content.getTitle());
+				content.setTitle(title.substring(0,
+						Math.min(2048, title.length())));
 
 				entry.setInserted(Calendar.getInstance().getTime());
 				addFeedToEntry(entry, feed);