diff --git a/federationapi/routing/routing.go b/federationapi/routing/routing.go
index ed32c890..9f576790 100644
--- a/federationapi/routing/routing.go
+++ b/federationapi/routing/routing.go
@@ -64,6 +64,7 @@ func Setup(
 	// {keyID} argument and always return a response containing all of the keys.
 	v2keysmux.Handle("/server/{keyID}", localKeys).Methods(http.MethodGet)
 	v2keysmux.Handle("/server/", localKeys).Methods(http.MethodGet)
+	v2keysmux.Handle("/server", localKeys).Methods(http.MethodGet)
 
 	v1fedmux.Handle("/send/{txnID}", common.MakeFedAPI(
 		"federation_send", cfg.Matrix.ServerName, keys,
diff --git a/testfile b/testfile
index cea6a4f4..17978913 100644
--- a/testfile
+++ b/testfile
@@ -170,3 +170,4 @@ Deleted tags appear in an incremental v2 /sync
 Outbound federation can query profile data
 /event/ on joined room works
 /event/ does not allow access to events before the user joined
+Federation key API allows unsigned requests for keys