diff --git a/commafeed-server/src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java b/commafeed-server/src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java
index f0dbf1e8..d50e59c8 100644
--- a/commafeed-server/src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java
+++ b/commafeed-server/src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java
@@ -103,7 +103,14 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
 			query.orderBy(status.entryUpdated.desc(), status.id.desc());
 		}
 
-		query.offset(offset).limit(limit);
+		if (offset > -1) {
+			query.offset(offset);
+		}
+
+		if (limit > -1) {
+			query.limit(limit);
+		}
+
 		setTimeout(query, config.getApplicationSettings().getQueryTimeout());
 
 		List<FeedEntryStatus> statuses = query.fetch();