diff --git a/roomserver/internal/query/query.go b/roomserver/internal/query/query.go
index 8f5745ef2..3f297b1d0 100644
--- a/roomserver/internal/query/query.go
+++ b/roomserver/internal/query/query.go
@@ -468,6 +468,7 @@ func (r *Queryer) QueryStateAndAuthChain(
 		for _, event := range authEvents {
 			response.AuthChainEvents = append(response.AuthChainEvents, event.Headered(info.RoomVersion))
 		}
+		return nil
 	}
 
 	var stateEvents []*gomatrixserverlib.Event