diff --git a/setup/base/base.go b/setup/base/base.go
index d96365cf0..ea342054c 100644
--- a/setup/base/base.go
+++ b/setup/base/base.go
@@ -85,6 +85,7 @@ func CreateFederationClient(cfg *config.Dendrite, dnsCache *fclient.DNSCache) fc
 		fclient.WithTimeout(time.Minute * 5),
 		fclient.WithSkipVerify(cfg.FederationAPI.DisableTLSValidation),
 		fclient.WithKeepAlives(!cfg.FederationAPI.DisableHTTPKeepalives),
+		fclient.WithUserAgent(fmt.Sprintf("Dendrite/%s", internal.VersionString())),
 	}
 	if cfg.Global.DNSCache.Enabled {
 		opts = append(opts, fclient.WithDNSCache(dnsCache))
@@ -92,7 +93,6 @@ func CreateFederationClient(cfg *config.Dendrite, dnsCache *fclient.DNSCache) fc
 	client := fclient.NewFederationClient(
 		identities, opts...,
 	)
-	client.WithUserAgent(fmt.Sprintf("Dendrite/%s", internal.VersionString()))
 	return client
 }
 
diff --git a/userapi/internal/device_list_update_test.go b/userapi/internal/device_list_update_test.go
index bbcc51aeb..4d075e524 100644
--- a/userapi/internal/device_list_update_test.go
+++ b/userapi/internal/device_list_update_test.go
@@ -147,8 +147,8 @@ func newFedClient(tripper func(*http.Request) (*http.Response, error)) fclient.F
 				PrivateKey: pkey,
 			},
 		},
+		fclient.WithTransport(&roundTripper{tripper}),
 	)
-	fedClient.SetInternalClient(*fclient.NewClient(fclient.WithTransport(&roundTripper{tripper})))
 	return fedClient
 }