diff --git a/src/main/java/com/commafeed/backend/FixedSizeSortedSet.java b/src/main/java/com/commafeed/backend/FixedSizeSortedSet.java
index a23362dc..a634288c 100644
--- a/src/main/java/com/commafeed/backend/FixedSizeSortedSet.java
+++ b/src/main/java/com/commafeed/backend/FixedSizeSortedSet.java
@@ -12,11 +12,11 @@ public class FixedSizeSortedSet<E> extends PriorityQueue<E> {
 	private static final long serialVersionUID = 1L;
 
 	private final Comparator<? super E> comparator;
-	private final int maxSize;
+	private final int capacity;
 
-	public FixedSizeSortedSet(int maxSize, Comparator<? super E> comparator) {
-		super(maxSize, comparator);
-		this.maxSize = maxSize;
+	public FixedSizeSortedSet(int capacity, Comparator<? super E> comparator) {
+		super(Math.max(1, capacity), comparator);
+		this.capacity = capacity < 0 ? Integer.MAX_VALUE : capacity;
 		this.comparator = comparator;
 	}
 
@@ -41,7 +41,7 @@ public class FixedSizeSortedSet<E> extends PriorityQueue<E> {
 	}
 
 	public boolean isFull() {
-		return size() == maxSize;
+		return size() == capacity;
 	}
 
 	@SuppressWarnings("unchecked")
diff --git a/src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java b/src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java
index fd358bc7..0d67b6eb 100644
--- a/src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java
+++ b/src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java
@@ -219,7 +219,7 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
 		Comparator<FeedEntryStatus> comparator = order == ReadingOrder.desc ? STATUS_COMPARATOR_DESC
 				: STATUS_COMPARATOR_ASC;
 		FixedSizeSortedSet<FeedEntryStatus> set = new FixedSizeSortedSet<FeedEntryStatus>(
-				capacity < 0 ? Integer.MAX_VALUE : capacity, comparator);
+				capacity, comparator);
 		for (FeedSubscription sub : subscriptions) {
 			Date last = (order != null && set.isFull()) ? set.last()
 					.getEntryUpdated() : null;