diff --git a/synapse/state/__init__.py b/synapse/state/__init__.py
index 03352bcdff44..50f859e74687 100644
--- a/synapse/state/__init__.py
+++ b/synapse/state/__init__.py
@@ -514,9 +514,12 @@ async def resolve_state_groups_for_events(
 
         room_version = await self.store.get_room_version_id(room_id)
 
+        # TODO: Use a state_filter here to only grab auth events (and maybe history visibility)?
+        asdf = StateFilter.from_types(
+            event_auth.auth_types_for_event(event.room_version, event)
+        )
         state_to_resolve = await self._state_storage_controller.get_state_for_groups(
-            state_group_ids_set
-            # TODO: Can we use a state_filter here to only grab auth events (and maybe history visibility)?
+            state_group_ids_set, state_filter=asdf
         )
 
         result = await self._state_resolution_handler.resolve_state_groups(