diff --git a/CHANGELOG.md b/CHANGELOG.md
index c9ceae7dc..d59ea31ff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - L2CAP: Fix accept incoming ERTM connection when Information Request already complete
 - HFP AG: activate all AG indicators upon service level connection establishment
 - HFP_AG: handle call termination in alerting call state
+- A2DP Sink: fix config API for AAC, ATRAC, and other codecs
 - SM: address update for non-resolvable private addresses
 
 ### Changed
diff --git a/src/classic/a2dp.c b/src/classic/a2dp.c
index 296c58edb..c279f7836 100644
--- a/src/classic/a2dp.c
+++ b/src/classic/a2dp.c
@@ -976,8 +976,7 @@ uint8_t a2dp_config_process_set_mpeg_aac(avdtp_role_t role, uint16_t a2dp_cid,
     }
     a2dp_config_process_t * config_process = a2dp_config_process_for_role(role, connection);
 
-    uint8_t status = a2dp_config_process_config_init(AVDTP_ROLE_SOURCE, connection, local_seid, remote_seid,
-                                                     AVDTP_CODEC_MPEG_2_4_AAC);
+    uint8_t status = a2dp_config_process_config_init(role, connection, local_seid, remote_seid, AVDTP_CODEC_MPEG_2_4_AAC);
     if (status != 0) {
         return status;
     }
@@ -999,8 +998,7 @@ uint8_t a2dp_config_process_set_atrac(avdtp_role_t role, uint16_t a2dp_cid, uint
     }
     a2dp_config_process_t * config_process = a2dp_config_process_for_role(role, connection);
 
-    uint8_t status = a2dp_config_process_config_init(AVDTP_ROLE_SOURCE, connection, local_seid, remote_seid,
-                                                     AVDTP_CODEC_ATRAC_FAMILY);
+    uint8_t status = a2dp_config_process_config_init(role, connection, local_seid, remote_seid, AVDTP_CODEC_ATRAC_FAMILY);
     if (status != 0) {
         return status;
     }
@@ -1024,8 +1022,7 @@ uint8_t a2dp_config_process_set_other(avdtp_role_t role, uint16_t a2dp_cid,  uin
     }
     a2dp_config_process_t * config_process = a2dp_config_process_for_role(role, connection);
 
-    uint8_t status = a2dp_config_process_config_init(AVDTP_ROLE_SOURCE, connection, local_seid, remote_seid,
-                                                     AVDTP_CODEC_NON_A2DP);
+    uint8_t status = a2dp_config_process_config_init(role, connection, local_seid, remote_seid, AVDTP_CODEC_NON_A2DP);
     if (status != 0) {
         return status;
     }