From 03d3792f3c7978ecc057cab19ff95c8310403665 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
Date: Fri, 20 Dec 2019 09:55:45 +0000
Subject: [PATCH] Fix exceptions when attempting to backfill (#6576)

Fixes #6575
---
 changelog.d/6576.bugfix        | 1 +
 synapse/handlers/federation.py | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/6576.bugfix

diff --git a/changelog.d/6576.bugfix b/changelog.d/6576.bugfix
new file mode 100644
index 0000000000..f5414fce4d
--- /dev/null
+++ b/changelog.d/6576.bugfix
@@ -0,0 +1 @@
+Fix errors when attempting to backfill rooms over federation.
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index abe02907b9..6fb453ce60 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -797,7 +797,10 @@ class FederationHandler(BaseHandler):
         events_to_state = {}
         for e_id in edges:
             state, auth = yield self._get_state_for_room(
-                destination=dest, room_id=room_id, event_id=e_id
+                destination=dest,
+                room_id=room_id,
+                event_id=e_id,
+                include_event_in_state=False,
             )
             auth_events.update({a.event_id: a for a in auth})
             auth_events.update({s.event_id: s for s in state})