diff --git a/commafeed-server/src/main/java/com/commafeed/backend/dao/FeedDAO.java b/commafeed-server/src/main/java/com/commafeed/backend/dao/FeedDAO.java
index ca21ec31..0917732f 100644
--- a/commafeed-server/src/main/java/com/commafeed/backend/dao/FeedDAO.java
+++ b/commafeed-server/src/main/java/com/commafeed/backend/dao/FeedDAO.java
@@ -13,10 +13,8 @@ import org.hibernate.SessionFactory;
 import com.commafeed.backend.model.Feed;
 import com.commafeed.backend.model.QFeed;
 import com.commafeed.backend.model.QFeedSubscription;
-import com.commafeed.backend.model.QUser;
 import com.google.common.collect.Iterables;
 import com.querydsl.jpa.JPAExpressions;
-import com.querydsl.jpa.JPQLQuery;
 
 @Singleton
 public class FeedDAO extends GenericDAO<Feed> {
@@ -28,18 +26,12 @@ public class FeedDAO extends GenericDAO<Feed> {
 		super(sessionFactory);
 	}
 
-	public List<Feed> findNextUpdatable(int count, Date lastLoginThreshold) {
-		JPQLQuery<Feed> query = query().selectFrom(feed);
-		query.where(feed.disabledUntil.isNull().or(feed.disabledUntil.lt(new Date())));
-
-		if (lastLoginThreshold != null) {
-			QFeedSubscription subs = QFeedSubscription.feedSubscription;
-			QUser user = QUser.user;
-
-			query.join(subs).on(subs.feed.id.eq(feed.id)).join(subs.user, user).where(user.lastLogin.gt(lastLoginThreshold));
-		}
-
-		return query.orderBy(feed.disabledUntil.asc()).limit(count).fetch();
+	public List<Feed> findNextUpdatable(int count) {
+		return query().selectFrom(feed)
+				.where(feed.disabledUntil.isNull().or(feed.disabledUntil.lt(new Date())))
+				.orderBy(feed.disabledUntil.asc())
+				.limit(count)
+				.fetch();
 	}
 
 	public void setDisabledUntil(List<Long> feedIds, Date date) {
diff --git a/commafeed-server/src/main/java/com/commafeed/backend/feed/FeedRefreshEngine.java b/commafeed-server/src/main/java/com/commafeed/backend/feed/FeedRefreshEngine.java
index 0668fa11..e5b98d6e 100644
--- a/commafeed-server/src/main/java/com/commafeed/backend/feed/FeedRefreshEngine.java
+++ b/commafeed-server/src/main/java/com/commafeed/backend/feed/FeedRefreshEngine.java
@@ -162,7 +162,7 @@ public class FeedRefreshEngine implements Managed {
 
 	private List<Feed> getNextUpdatableFeeds(int max) {
 		return UnitOfWork.call(sessionFactory, () -> {
-			List<Feed> feeds = feedDAO.findNextUpdatable(max, getLastLoginThreshold());
+			List<Feed> feeds = feedDAO.findNextUpdatable(max);
 			// update disabledUntil to prevent feeds from being returned again by feedDAO.findNextUpdatable()
 			Date nextUpdateDate = DateUtils.addMinutes(new Date(), config.getApplicationSettings().getRefreshIntervalMinutes());
 			feedDAO.setDisabledUntil(feeds.stream().map(AbstractModel::getId).collect(Collectors.toList()), nextUpdateDate);
@@ -174,10 +174,6 @@ public class FeedRefreshEngine implements Managed {
 		return Math.min(100, 3 * config.getApplicationSettings().getBackgroundThreads());
 	}
 
-	private Date getLastLoginThreshold() {
-		return Boolean.TRUE.equals(config.getApplicationSettings().getHeavyLoad()) ? DateUtils.addDays(new Date(), -30) : null;
-	}
-
 	@Override
 	public void stop() {
 		this.feedProcessingLoopExecutor.shutdownNow();