diff --git a/src/main/java/com/commafeed/backend/StartupBean.java b/src/main/java/com/commafeed/backend/StartupBean.java
index b45b6626..68f2556d 100644
--- a/src/main/java/com/commafeed/backend/StartupBean.java
+++ b/src/main/java/com/commafeed/backend/StartupBean.java
@@ -27,7 +27,6 @@ import com.commafeed.backend.dao.FeedCategoryDAO;
 import com.commafeed.backend.dao.FeedDAO;
 import com.commafeed.backend.dao.FeedSubscriptionDAO;
 import com.commafeed.backend.dao.UserDAO;
-import com.commafeed.backend.feeds.FeedRefreshUpdater;
 import com.commafeed.backend.feeds.FeedRefreshWorker;
 import com.commafeed.backend.model.ApplicationSettings;
 import com.commafeed.backend.model.UserRole.Role;
@@ -62,9 +61,6 @@ public class StartupBean {
 	@Inject
 	ApplicationSettingsService applicationSettingsService;
 
-	@Inject
-	FeedRefreshUpdater feedRefreshUpdater;
-
 	@Inject
 	Instance<FeedRefreshWorker> workers;
 
@@ -149,7 +145,6 @@ public class StartupBean {
 				log.error("interrupted while waiting for threads to finish.");
 			}
 		}
-		feedRefreshUpdater.shutdown();
 	}
 
 }
diff --git a/src/main/java/com/commafeed/backend/feeds/FeedRefreshUpdater.java b/src/main/java/com/commafeed/backend/feeds/FeedRefreshUpdater.java
index dc7d7f88..efc0c12e 100644
--- a/src/main/java/com/commafeed/backend/feeds/FeedRefreshUpdater.java
+++ b/src/main/java/com/commafeed/backend/feeds/FeedRefreshUpdater.java
@@ -8,6 +8,7 @@ import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
 import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
@@ -78,6 +79,7 @@ public class FeedRefreshUpdater {
 		});
 	}
 
+	@PreDestroy
 	public void shutdown() {
 		pool.shutdownNow();
 		while (!pool.isTerminated()) {