diff --git a/CHANGELOG.md b/CHANGELOG.md
index 99664d152..7fecf925a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - HSP HS: use EV3 and 2EV3 packets for 7.5 ms voice interval
 - AVDTP: use round robin for outgoing connections
 - AVRCP: use round robin for outgoing connections
+- GOEP Client: use round robin for outgoing connections
 
 ### Changed
 - HCI: hci_reserved_packet_buffer and higher layer functions asserts if packet buffer is free instead of return value
diff --git a/src/classic/goep_client.c b/src/classic/goep_client.c
index 84ee5eccc..00c2caf8e 100644
--- a/src/classic/goep_client.c
+++ b/src/classic/goep_client.c
@@ -529,7 +529,7 @@ uint8_t goep_client_connect_l2cap(goep_client_t *goep_client, l2cap_ertm_config_
     memcpy(&goep_client->ertm_config, l2cap_ertm_config, sizeof(l2cap_ertm_config_t));
     goep_client->ertm_buffer_size = l2cap_ertm_buffer_size;
     goep_client->ertm_buffer = l2cap_ertm_buffer;
-    btstack_linked_list_add(&goep_clients, (btstack_linked_item_t *) goep_client);
+    btstack_linked_list_add_tail(&goep_clients, (btstack_linked_item_t *) goep_client);
 
     goep_client->l2cap_psm = l2cap_psm;