diff --git a/changelog.d/+d4d958b9.bugfix.md b/changelog.d/+d4d958b9.bugfix.md
new file mode 100644
index 000000000..1077c5902
--- /dev/null
+++ b/changelog.d/+d4d958b9.bugfix.md
@@ -0,0 +1 @@
+The userinfo endpoint is now accessible even if federation is disabled, allowing LiveKit to be used on servers with federation disabled without using the server name whitelist.
diff --git a/src/api/router.rs b/src/api/router.rs
index 1912f096a..de2736e2b 100644
--- a/src/api/router.rs
+++ b/src/api/router.rs
@@ -224,7 +224,6 @@ pub fn build(router: Router<State>, state: State) -> Router<State> {
 			.ruma_route(&server::get_profile_information_route)
 			.ruma_route(&server::get_keys_route)
 			.ruma_route(&server::claim_keys_route)
-			.ruma_route(&server::get_openid_userinfo_route)
 			.ruma_route(&server::get_hierarchy_route)
 			.ruma_route(&server::well_known_server)
 			.ruma_route(&server::get_content_route)
@@ -238,6 +237,10 @@ pub fn build(router: Router<State>, state: State) -> Router<State> {
 			.route("/_continuwuity/local_user_count", any(federation_disabled));
 	}
 
+	// Always add userinfo endpoint, even if federation is disabled, so livekit
+	// and other functionality will continue to work
+	router = router.ruma_route(&server::get_openid_userinfo_route);
+
 	if config.allow_legacy_media {
 		router = router
 			.ruma_route(&client::get_media_config_legacy_route)