diff --git a/app/src/main/java/com/google/reviewit/app/QueryHandler.java b/app/src/main/java/com/google/reviewit/app/QueryHandler.java
index 0a87518..bb796e6 100644
--- a/app/src/main/java/com/google/reviewit/app/QueryHandler.java
+++ b/app/src/main/java/com/google/reviewit/app/QueryHandler.java
@@ -65,7 +65,8 @@
   public List<Change> next() throws RestApiException {
     query();
     List<Change> nextChanges =
-        result.subList(page * LIMIT_QUERY, (page + 1) * LIMIT_QUERY);
+        result.subList(page * LIMIT_QUERY,
+            Math.min((page + 1) * LIMIT_QUERY, result.size()));
     page++;
     return nextChanges;
   }