diff --git a/src/service/rooms/event_handler/fetch_state.rs b/src/service/rooms/event_handler/fetch_state.rs
index 7a82bdb06..d9908a625 100644
--- a/src/service/rooms/event_handler/fetch_state.rs
+++ b/src/service/rooms/event_handler/fetch_state.rs
@@ -255,6 +255,11 @@ async fn fetch_state_ids_from_backfill_servers(
 			.timeline
 			.candidate_backfill_servers(&room_id)
 			.await;
+		if candidates.is_empty() {
+			return Err!(Request(NotFound(
+				"Cannot ask any other servers for the state at this event"
+			)));
+		}
 		debug!(%room_id, ?candidates, "Asking backfill servers for state_ids");
 		let futures = candidates.iter().map(|server_name| {
 			Box::pin(