diff --git a/src/main/java/com/commafeed/backend/services/FeedUpdateService.java b/src/main/java/com/commafeed/backend/services/FeedUpdateService.java
index bed7fd79..96d6dd06 100644
--- a/src/main/java/com/commafeed/backend/services/FeedUpdateService.java
+++ b/src/main/java/com/commafeed/backend/services/FeedUpdateService.java
@@ -4,7 +4,9 @@ import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Collection;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
+import javax.ejb.AccessTimeout;
 import javax.ejb.Lock;
 import javax.ejb.LockType;
 import javax.ejb.Singleton;
@@ -41,6 +43,7 @@ public class FeedUpdateService {
 	MetricsBean metricsBean;
 
 	@Lock(LockType.WRITE)
+	@AccessTimeout(value = 5, unit = TimeUnit.MINUTES)
 	public void updateEntries(Feed feed, Collection<FeedEntry> entries) {
 
 		List<FeedEntry> existingEntries = getExistingEntries(entries);