diff --git a/irc/server.go b/irc/server.go
index 28e0b01b..4e976882 100644
--- a/irc/server.go
+++ b/irc/server.go
@@ -836,7 +836,7 @@ func (server *Server) applyConfig(config *Config, initial bool) error {
 	server.languages = lm
 
 	// Metadata
-	CapValues.Set(caps.Metadata, "maxsub=10")
+	CapValues.Set(caps.Metadata, fmt.Sprintf("maxkey=%d,maxsub=%d", server.MetadataKeysLimit(), server.MetadataSubsLimit()))
 
 	// SASL
 	oldAccountConfig := server.AccountConfig()