diff --git a/synapse/storage/event_push_actions.py b/synapse/storage/event_push_actions.py
index 85290d2a9..6f316f7d2 100644
--- a/synapse/storage/event_push_actions.py
+++ b/synapse/storage/event_push_actions.py
@@ -120,14 +120,15 @@ class EventPushActionsStore(SQLBaseStore):
             sql = (
                 "SELECT ep.event_id, ep.room_id, ep.stream_ordering, ep.actions, "
                 "e.received_ts "
-                "FROM event_push_actions AS ep, ("
+                "FROM ("
                 "   SELECT room_id, user_id, "
                 "       max(topological_ordering) as topological_ordering, "
                 "       max(stream_ordering) as stream_ordering "
                 "       FROM events"
                 "   NATURAL JOIN receipts_linearized WHERE receipt_type = 'm.read'"
                 "   GROUP BY room_id, user_id"
-                ") AS rl"
+                ") AS rl,"
+                " event_push_actions AS ep"
                 " INNER JOIN events AS e USING (room_id, event_id)"
                 " WHERE"
                 "   ep.room_id = rl.room_id"