diff --git a/federationapi/internal/perform.go b/federationapi/internal/perform.go
index df27c1d94..aa02a129c 100644
--- a/federationapi/internal/perform.go
+++ b/federationapi/internal/perform.go
@@ -170,7 +170,7 @@ func (r *FederationInternalAPI) performJoinUsingServer(
 		},
 	}
 
-	event, respState, err := fclient.PerformJoin(ctx, r.federation, joinInput, callbacks)
+	response, err := fclient.PerformJoin(ctx, r.federation, joinInput, callbacks)
 	if err != nil {
 		return err
 	}
@@ -181,7 +181,7 @@ func (r *FederationInternalAPI) performJoinUsingServer(
 	// joining a room, waiting for 200 OK then changing device keys and have those keys not be sent
 	// to other servers (this was a cause of a flakey sytest "Local device key changes get to remote servers")
 	// The events are trusted now as we performed auth checks above.
-	joinedHosts, err := consumers.JoinedHostsFromEvents(respState.GetStateEvents().TrustedEvents(event.RoomVersion, false))
+	joinedHosts, err := consumers.JoinedHostsFromEvents(response.StateSnapshot.GetStateEvents().TrustedEvents(response.JoinEvent.RoomVersion, false))
 	if err != nil {
 		return fmt.Errorf("JoinedHostsFromEvents: failed to get joined hosts: %s", err)
 	}
@@ -197,8 +197,8 @@ func (r *FederationInternalAPI) performJoinUsingServer(
 		r.rsAPI,
 		user.Domain(),
 		roomserverAPI.KindNew,
-		respState,
-		event,
+		response.StateSnapshot,
+		response.JoinEvent,
 		serverName,
 		nil,
 		false,