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 bd541ef5..4757cfb7 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
@@ -36,7 +36,7 @@ public class FeedDAO extends GenericDAO<Feed> {
 			QFeedSubscription subs = QFeedSubscription.feedSubscription;
 			QUser user = QUser.user;
 
-			query.join(feed.subscriptions, subs).join(subs.user, user).where(user.lastLogin.gt(lastLoginThreshold));
+			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();
diff --git a/commafeed-server/src/main/java/com/commafeed/backend/model/Feed.java b/commafeed-server/src/main/java/com/commafeed/backend/model/Feed.java
index 5229f3a5..9ac4e736 100644
--- a/commafeed-server/src/main/java/com/commafeed/backend/model/Feed.java
+++ b/commafeed-server/src/main/java/com/commafeed/backend/model/Feed.java
@@ -1,11 +1,9 @@
 package com.commafeed.backend.model;
 
 import java.util.Date;
-import java.util.Set;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.OneToMany;
 import javax.persistence.Table;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
@@ -123,7 +121,4 @@ public class Feed extends AbstractModel {
 	@Temporal(TemporalType.TIMESTAMP)
 	private Date pushLastPing;
 
-	@OneToMany(mappedBy = "feed")
-	private Set<FeedSubscription> subscriptions;
-
 }