diff --git a/cmd/dendrite-demo-pinecone/users/users.go b/cmd/dendrite-demo-pinecone/users/users.go
index 5de8b8e95..079df328d 100644
--- a/cmd/dendrite-demo-pinecone/users/users.go
+++ b/cmd/dendrite-demo-pinecone/users/users.go
@@ -127,7 +127,7 @@ func bulkFetchUserDirectoriesFromServers(
 				)
 			}
 			res := &userapi.QuerySearchProfilesResponse{}
-			if err = fedClient.InternalClient().DoRequestAndParseResponse(reqctx, httpReq, res); err != nil {
+			if err = fedClient.DoRequestAndParseResponse(reqctx, httpReq, res); err != nil {
 				util.GetLogger(reqctx).WithError(err).WithField("hs", homeserverDomain).Warn(
 					"bulkFetchUserDirectoriesFromServers: failed to query hs",
 				)
diff --git a/cmd/furl/main.go b/cmd/furl/main.go
index b775359c3..cdfef09f7 100644
--- a/cmd/furl/main.go
+++ b/cmd/furl/main.go
@@ -111,7 +111,7 @@ func main() {
 	}
 
 	var res interface{}
-	err = client.InternalClient().DoRequestAndParseResponse(
+	err = client.DoRequestAndParseResponse(
 		context.TODO(),
 		httpReq,
 		&res,
diff --git a/setup/base/base.go b/setup/base/base.go
index f595d8d35..d96365cf0 100644
--- a/setup/base/base.go
+++ b/setup/base/base.go
@@ -92,7 +92,7 @@ func CreateFederationClient(cfg *config.Dendrite, dnsCache *fclient.DNSCache) fc
 	client := fclient.NewFederationClient(
 		identities, opts...,
 	)
-	client.InternalClient().SetUserAgent(fmt.Sprintf("Dendrite/%s", internal.VersionString()))
+	client.WithUserAgent(fmt.Sprintf("Dendrite/%s", internal.VersionString()))
 	return client
 }