diff --git a/changelog.d/18858.bugfix b/changelog.d/18858.bugfix new file mode 100644 index 0000000000..e71e224770 --- /dev/null +++ b/changelog.d/18858.bugfix @@ -0,0 +1 @@ +Do not throw an error when fetching a rejected delayed state event on startup. diff --git a/synapse/handlers/delayed_events.py b/synapse/handlers/delayed_events.py index ce13dcc737..a6749801a5 100644 --- a/synapse/handlers/delayed_events.py +++ b/synapse/handlers/delayed_events.py @@ -215,9 +215,9 @@ class DelayedEventsHandler: "Handling: %r %r, %s", delta.event_type, delta.state_key, delta.event_id ) - event = await self._store.get_event( - delta.event_id, check_room_id=delta.room_id - ) + event = await self._store.get_event(delta.event_id, allow_none=True) + if not event: + continue sender = UserID.from_string(event.sender) next_send_ts = await self._store.cancel_delayed_state_events(