diff --git a/src/main/java/com/commafeed/backend/HttpGetter.java b/src/main/java/com/commafeed/backend/HttpGetter.java
index 8baed463..5eed2de7 100644
--- a/src/main/java/com/commafeed/backend/HttpGetter.java
+++ b/src/main/java/com/commafeed/backend/HttpGetter.java
@@ -1,7 +1,5 @@
 package com.commafeed.backend;
 
-import javax.ejb.Stateless;
-
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.HttpClient;
@@ -11,7 +9,6 @@ import org.apache.http.params.HttpConnectionParams;
 import org.apache.http.params.HttpProtocolParams;
 import org.apache.http.util.EntityUtils;
 
-@Stateless
 public class HttpGetter {
 
 	public String get(String url) throws Exception {
diff --git a/src/main/java/com/commafeed/backend/feeds/FeedFetcher.java b/src/main/java/com/commafeed/backend/feeds/FeedFetcher.java
index 77c854b7..10cc9aee 100644
--- a/src/main/java/com/commafeed/backend/feeds/FeedFetcher.java
+++ b/src/main/java/com/commafeed/backend/feeds/FeedFetcher.java
@@ -1,6 +1,5 @@
 package com.commafeed.backend.feeds;
 
-import javax.ejb.Stateless;
 import javax.inject.Inject;
 
 import org.jsoup.Jsoup;
@@ -13,7 +12,6 @@ import com.commafeed.backend.HttpGetter;
 import com.commafeed.backend.model.Feed;
 import com.sun.syndication.io.FeedException;
 
-@Stateless
 public class FeedFetcher {
 
 	private static Logger log = LoggerFactory.getLogger(FeedFetcher.class);
diff --git a/src/main/java/com/commafeed/backend/feeds/FeedParser.java b/src/main/java/com/commafeed/backend/feeds/FeedParser.java
index 23e59e95..630747bd 100644
--- a/src/main/java/com/commafeed/backend/feeds/FeedParser.java
+++ b/src/main/java/com/commafeed/backend/feeds/FeedParser.java
@@ -4,8 +4,6 @@ import java.io.StringReader;
 import java.util.Calendar;
 import java.util.List;
 
-import javax.ejb.Stateless;
-
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.SystemUtils;
 import org.jsoup.Jsoup;
@@ -21,7 +19,6 @@ import com.sun.syndication.feed.synd.SyndFeed;
 import com.sun.syndication.io.FeedException;
 import com.sun.syndication.io.SyndFeedInput;
 
-@Stateless
 public class FeedParser {
 
 	@SuppressWarnings("unchecked")
diff --git a/src/main/java/com/commafeed/backend/feeds/FeedTimer.java b/src/main/java/com/commafeed/backend/feeds/FeedTimer.java
index 00397879..88600bf0 100644
--- a/src/main/java/com/commafeed/backend/feeds/FeedTimer.java
+++ b/src/main/java/com/commafeed/backend/feeds/FeedTimer.java
@@ -1,5 +1,7 @@
 package com.commafeed.backend.feeds;
 
+import javax.ejb.Lock;
+import javax.ejb.LockType;
 import javax.ejb.Schedule;
 import javax.ejb.Singleton;
 import javax.inject.Inject;
@@ -17,6 +19,7 @@ public class FeedTimer {
 	FeedUpdater updater;
 
 	@Schedule(hour = "*", minute = "*", persistent = false)
+	@Lock(LockType.READ)
 	private void timeout() {
 		for (Feed feed : feedService.findAll()) {
 			updater.update(feed);
diff --git a/src/main/java/com/commafeed/backend/feeds/OPMLImporter.java b/src/main/java/com/commafeed/backend/feeds/OPMLImporter.java
index 541903da..19d1b990 100644
--- a/src/main/java/com/commafeed/backend/feeds/OPMLImporter.java
+++ b/src/main/java/com/commafeed/backend/feeds/OPMLImporter.java
@@ -3,7 +3,6 @@ package com.commafeed.backend.feeds;
 import java.io.StringReader;
 import java.util.List;
 
-import javax.ejb.Stateless;
 import javax.inject.Inject;
 
 import org.apache.commons.lang.StringUtils;
@@ -20,7 +19,6 @@ import com.sun.syndication.feed.opml.Outline;
 import com.sun.syndication.io.FeedException;
 import com.sun.syndication.io.WireFeedInput;
 
-@Stateless
 public class OPMLImporter {
 
 	@Inject