diff --git a/server/conn.go b/server/conn.go
index 7fc80727c..b3987ff88 100644
--- a/server/conn.go
+++ b/server/conn.go
@@ -156,6 +156,8 @@ func (c *Conn) Charset() uint8 {
 	return c.charset
 }
 
+// Attributes returns the connection attributes.
+// Note that this is only sent to the server if CLIENT_CONNECT_ATTRS is set.
 func (c *Conn) Attributes() map[string]string {
 	return c.attributes
 }
diff --git a/server/server_conf.go b/server/server_conf.go
index bff1967c9..4db71c6aa 100644
--- a/server/server_conf.go
+++ b/server/server_conf.go
@@ -51,7 +51,8 @@ func NewDefaultServer() *Server {
 		serverVersion:   "8.0.11",
 		protocolVersion: 10,
 		capability: CLIENT_LONG_PASSWORD | CLIENT_LONG_FLAG | CLIENT_CONNECT_WITH_DB | CLIENT_PROTOCOL_41 |
-			CLIENT_TRANSACTIONS | CLIENT_SECURE_CONNECTION | CLIENT_PLUGIN_AUTH | CLIENT_SSL | CLIENT_PLUGIN_AUTH_LENENC_CLIENT_DATA,
+			CLIENT_TRANSACTIONS | CLIENT_SECURE_CONNECTION | CLIENT_PLUGIN_AUTH | CLIENT_SSL |
+			CLIENT_PLUGIN_AUTH_LENENC_CLIENT_DATA | CLIENT_CONNECT_ATTRS,
 		collationId:       DEFAULT_COLLATION_ID,
 		defaultAuthMethod: AUTH_NATIVE_PASSWORD,
 		pubKey:            getPublicKeyFromCert(certPem),