diff --git a/federationapi/internal/federationclient.go b/federationapi/internal/federationclient.go index d4d7269db..a25783f1f 100644 --- a/federationapi/internal/federationclient.go +++ b/federationapi/internal/federationclient.go @@ -29,8 +29,6 @@ func (a *FederationInternalAPI) MakeJoin( func (a *FederationInternalAPI) SendJoin( ctx context.Context, origin, s spec.ServerName, event gomatrixserverlib.PDU, ) (res gomatrixserverlib.SendJoinResponse, err error) { - ctx, cancel := context.WithTimeout(ctx, defaultTimeout) - defer cancel() ires, err := a.federation.SendJoin(ctx, origin, s, event) if err != nil { return &fclient.RespSendJoin{}, err