1 files changed, 5 insertions, 2 deletions
diff --git a/synapse/storage/state.py b/synapse/storage/state.py
index 6d7d576cb6..6d0ecf8dd9 100644
--- a/synapse/storage/state.py
+++ b/synapse/storage/state.py
@@ -85,8 +85,10 @@ class StateStore(SQLBaseStore):
 
         def fetch_events(txn, events):
             sql = (
-                "SELECT e.internal_metadata, e.json "
+                "SELECT e.internal_metadata, e.json, r.redacts, rej.event_id "
                 " FROM event_json as e"
+                " LEFT JOIN rejections as rej USING (event_id)"
+                " LEFT JOIN redactions as r ON e.event_id = r.redacts"
                 " WHERE e.event_id IN (%s)"
             ) % (",".join(["?"]*len(events)),)
 
@@ -95,7 +97,8 @@ class StateStore(SQLBaseStore):
 
             return [
                 self._get_event_from_row_txn(
-                    txn, row[0], row[1], None
+                    txn, row[0], row[1], row[2],
+                    rejected_reason=row[3],
                 )
                 for row in rows
             ]