Merge remote-tracking branch 'origin/develop' into mv/unbind-callback

1 files changed, 1 insertions, 1 deletions

diff --git a/synapse/streams/__init__.py b/synapse/streams/__init__.py

index 806b671305..2dcd43d0a2 100644
--- a/synapse/streams/__init__.py
+++ b/synapse/streams/__init__.py
@@ -27,7 +27,7 @@ class EventSource(Generic[K, R]):
         self,
         user: UserID,
         from_key: K,
-        limit: Optional[int],
+        limit: int,
         room_ids: Collection[str],
         is_guest: bool,
         explicit_room_id: Optional[str] = None,