merge uncommitted changes from matrix.org into hotfixes-v0.18.5 github/hotfixes-v0.18.5 hotfixes-v0.18.5

1 files changed, 2 insertions, 2 deletions

diff --git a/synapse/storage/event_push_actions.py b/synapse/storage/event_push_actions.py

index 7de3e8c58c..1874737674 100644
--- a/synapse/storage/event_push_actions.py
+++ b/synapse/storage/event_push_actions.py
@@ -101,11 +101,11 @@ class EventPushActionsStore(SQLBaseStore):
             # notif=1
             sql = (
                 "SELECT count(*)"
-                " FROM event_push_actions ea"
+                " FROM (SELECT * FROM event_push_actions"
                 " WHERE"
                 " user_id = ?"
                 " AND room_id = ?"
-                " AND %s"
+                " AND %s LIMIT 100) as ea"
             ) % (lower_bound(token, self.database_engine, inclusive=False),)
 
             txn.execute(sql, (user_id, room_id))