diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3d785c468..a2c797283 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - hfp_hf, hsp_hs: use eSCO params in accept sco connection only for incoming eSCO connections
 - pbap_client: fix PBAP UUID len on connect message
 - sm: fix secure connection pairing as peripheral when local user confirmation happens after remote one
+- A2DP Source: only connect to remote sink stream endpoints
 
 ### Added
 - example/le_mitm: MITM implementation that forwards ATT PDUs and allows for pairing
diff --git a/src/classic/a2dp_source.c b/src/classic/a2dp_source.c
index 9faa4a798..5d4d72ea5 100644
--- a/src/classic/a2dp_source.c
+++ b/src/classic/a2dp_source.c
@@ -418,8 +418,11 @@ static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packe
             sep.in_use = avdtp_subevent_signaling_sep_found_get_in_use(packet);
             sep.media_type = (avdtp_media_type_t) avdtp_subevent_signaling_sep_found_get_media_type(packet);
             sep.type = (avdtp_sep_type_t) avdtp_subevent_signaling_sep_found_get_sep_type(packet);
-            log_info("A2DP Found sep: remote seid %u, in_use %d, media type %d, sep type %d (1-SNK), index %d", sep.seid, sep.in_use, sep.media_type, sep.type, num_remote_seps);
-            remote_seps[num_remote_seps++] = sep;
+            log_info("A2DP Found sep: remote seid %u, in_use %d, media type %d, sep type %s (1-SNK), index %d",
+                    sep.seid, sep.in_use, sep.media_type, sep.type == AVDTP_SOURCE ? "source" : "sink", num_remote_seps);
+            if (sep.type == AVDTP_SINK){
+                remote_seps[num_remote_seps++] = sep;
+            }
             break;
         }
         case AVDTP_SUBEVENT_SIGNALING_SEP_DICOVERY_DONE: