diff --git a/synapse/storage/stream.py b/synapse/storage/stream.py
index 6bfa00d59a..47f05a41bd 100644
--- a/synapse/storage/stream.py
+++ b/synapse/storage/stream.py
@@ -51,7 +51,7 @@ class StreamStore(SQLBaseStore):
         if limit:
             limit = max(limit, MAX_STREAM_SIZE)
         else:
-            limit = 1000
+            limit = MAX_STREAM_SIZE
 
         # From and to keys should be integers from ordering.
         from_key = int(from_key)