diff --git a/keyserver/src/fetchers/message-fetchers.js b/keyserver/src/fetchers/message-fetchers.js
--- a/keyserver/src/fetchers/message-fetchers.js
+++ b/keyserver/src/fetchers/message-fetchers.js
@@ -294,6 +294,7 @@
   query.append(selectionClause);
   query.append(SQL`
         ORDER BY m.thread, m.time DESC
+        LIMIT 18446744073709551615
       ) x
     ) y
     WHERE y.number <= ${numberPerThread}