diff --git a/internal/config/config.go b/internal/config/config.go
index 1fd083d0a..2a95069a4 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -622,6 +622,7 @@ func (config *Dendrite) checkListen(configErrs *configErrors) {
 	checkNotEmpty(configErrs, "listen.sync_api", string(config.Listen.SyncAPI))
 	checkNotEmpty(configErrs, "listen.room_server", string(config.Listen.RoomServer))
 	checkNotEmpty(configErrs, "listen.edu_server", string(config.Listen.EDUServer))
+	checkNotEmpty(configErrs, "listen.server_key_api", string(config.Listen.EDUServer))
 }
 
 // checkLogging verifies the parameters logging.* are valid.
diff --git a/serverkeyapi/api/http.go b/serverkeyapi/api/http.go
index 95a8057a0..ab89f7bfc 100644
--- a/serverkeyapi/api/http.go
+++ b/serverkeyapi/api/http.go
@@ -10,10 +10,10 @@ import (
 )
 
 const (
-	// RoomserverPerformJoinPath is the HTTP path for the PerformJoin API.
+	// ServerKeyInputPublicKeyPath is the HTTP path for the InputPublicKeys API.
 	ServerKeyInputPublicKeyPath = "/serverkeyapi/inputPublicKey"
 
-	// RoomserverPerformLeavePath is the HTTP path for the PerformLeave API.
+	// ServerKeyQueryPublicKeyPath is the HTTP path for the QueryPublicKeys API.
 	ServerKeyQueryPublicKeyPath = "/serverkeyapi/queryPublicKey"
 )
 
diff --git a/serverkeyapi/internal/api.go b/serverkeyapi/internal/api.go
index 150d4c223..cbae59d9a 100644
--- a/serverkeyapi/internal/api.go
+++ b/serverkeyapi/internal/api.go
@@ -5,7 +5,6 @@ import (
 	"fmt"
 
 	"github.com/matrix-org/dendrite/internal/caching"
-	"github.com/matrix-org/dendrite/internal/config"
 	"github.com/matrix-org/dendrite/serverkeyapi/api"
 	"github.com/matrix-org/gomatrixserverlib"
 )
@@ -13,7 +12,6 @@ import (
 type ServerKeyAPI struct {
 	api.ServerKeyInternalAPI
 
-	Cfg            *config.Dendrite
 	ImmutableCache caching.ImmutableCache
 	OurKeyRing     gomatrixserverlib.KeyRing
 	FedClient      *gomatrixserverlib.FederationClient
diff --git a/serverkeyapi/serverkeyapi.go b/serverkeyapi/serverkeyapi.go
index bfb975fce..61d807d64 100644
--- a/serverkeyapi/serverkeyapi.go
+++ b/serverkeyapi/serverkeyapi.go
@@ -34,7 +34,6 @@ func SetupServerKeyAPIComponent(
 	}
 
 	internalAPI := internal.ServerKeyAPI{
-		Cfg:            base.Cfg,
 		ImmutableCache: base.ImmutableCache,
 		FedClient:      fedClient,
 		OurKeyRing: gomatrixserverlib.KeyRing{