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

1 files changed, 1 insertions, 1 deletions

diff --git a/synapse/handlers/account_data.py b/synapse/handlers/account_data.py

index 0478448b47..fc21d58001 100644
--- a/synapse/handlers/account_data.py
+++ b/synapse/handlers/account_data.py
@@ -225,7 +225,7 @@ class AccountDataEventSource(EventSource[int, JsonDict]):
         self,
         user: UserID,
         from_key: int,
-        limit: Optional[int],
+        limit: int,
         room_ids: Collection[str],
         is_guest: bool,
         explicit_room_id: Optional[str] = None,