diff --git a/src/classic/a2dp_sink.c b/src/classic/a2dp_sink.c
index 9c0b06170..c02b111c2 100644
--- a/src/classic/a2dp_sink.c
+++ b/src/classic/a2dp_sink.c
@@ -157,7 +157,6 @@ void a2dp_sink_register_media_handler(void (*callback)(uint8_t local_seid, uint8
 
 void a2dp_sink_init(void){
     avdtp_sink_init(&a2dp_sink_context);
-    l2cap_register_service(&packet_handler, BLUETOOTH_PROTOCOL_AVDTP, 0xffff, LEVEL_0);
 }
 
 uint8_t a2dp_sink_create_stream_endpoint(avdtp_media_type_t media_type, avdtp_media_codec_type_t media_codec_type, 
diff --git a/src/classic/a2dp_source.c b/src/classic/a2dp_source.c
index db7515db4..b15ed35b6 100644
--- a/src/classic/a2dp_source.c
+++ b/src/classic/a2dp_source.c
@@ -442,7 +442,6 @@ void a2dp_source_register_packet_handler(btstack_packet_handler_t callback){
 
 void a2dp_source_init(void){
     avdtp_source_init(&a2dp_source_context);
-    l2cap_register_service(&packet_handler, BLUETOOTH_PROTOCOL_AVDTP, 0xffff, LEVEL_0);
 }
 
 avdtp_stream_endpoint_t * a2dp_source_create_stream_endpoint(avdtp_media_type_t media_type, avdtp_media_codec_type_t media_codec_type,