diff --git a/changelog.d/13431.misc b/changelog.d/13431.misc
new file mode 100644
index 000000000..655be4061
--- /dev/null
+++ b/changelog.d/13431.misc
@@ -0,0 +1 @@
+Refactor `_resolve_state_at_missing_prevs` to compute an `EventContext` instead.
diff --git a/synapse/handlers/federation_event.py b/synapse/handlers/federation_event.py
index 612e5aaa5..91d143919 100644
--- a/synapse/handlers/federation_event.py
+++ b/synapse/handlers/federation_event.py
@@ -23,6 +23,7 @@ from typing import (
     Dict,
     Iterable,
     List,
+    Optional,
     Sequence,
     Set,
     Tuple,