diff --git a/src/classic/avdtp_source.c b/src/classic/avdtp_source.c
index b42caf546..8135f79e5 100644
--- a/src/classic/avdtp_source.c
+++ b/src/classic/avdtp_source.c
@@ -254,14 +254,6 @@ static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packe
     avdtp_packet_handler(packet_type, channel, packet, size, &avdtp_source_context);      
 }
 
-void avdtp_set_fill_audio_ring_buffer_timeout_ms(avdtp_stream_endpoint_t * stream_endpoint, uint32_t timeout_ms){
-    if (!stream_endpoint){
-        printf("avdtp_set_fill_audio_ring_buffer_timeout_ms: stream_endpoint does not exist\n");
-        return;
-    }
-    stream_endpoint->fill_audio_ring_buffer_timeout_ms = timeout_ms;
-}
-
 void avdtp_source_init(void){
     avdtp_source_context.stream_endpoints = NULL;
     avdtp_source_context.connections = NULL;
diff --git a/src/classic/avdtp_source.h b/src/classic/avdtp_source.h
index dbb156b64..a1e96312b 100644
--- a/src/classic/avdtp_source.h
+++ b/src/classic/avdtp_source.h
@@ -165,8 +165,6 @@ void avdtp_source_stop_stream(uint16_t con_handle, uint8_t acp_seid);
 
 avdtp_stream_endpoint_t * avdtp_source_create_stream_endpoint(avdtp_sep_type_t sep_type, avdtp_media_type_t media_type);
 
-void avdtp_set_fill_audio_ring_buffer_timeout_ms(avdtp_stream_endpoint_t * stream_endpoint, uint32_t timeout_ms);
-
 /* API_END */
 
 #if defined __cplusplus
diff --git a/test/avdtp/avdtp_source_demo.c b/test/avdtp/avdtp_source_demo.c
index 103065cfb..086bb13f6 100644
--- a/test/avdtp/avdtp_source_demo.c
+++ b/test/avdtp/avdtp_source_demo.c
@@ -607,7 +607,6 @@ static void avdtp_source_stream_data_stop(avdtp_stream_endpoint_t * stream_endpo
             printf("stream_endpoint in wrong state %d\n", stream_endpoint->state);
             return;
     } 
-
 }
 
 static void stdin_process(btstack_data_source_t *ds, btstack_data_source_callback_type_t callback_type){
@@ -711,7 +710,6 @@ int btstack_main(int argc, const char * argv[]){
     gap_discoverable_control(1);
     gap_set_class_of_device(0x200408);
     
-    avdtp_set_fill_audio_ring_buffer_timeout_ms(local_stream_endpoint, 50);
     memset(audio_samples_storage, 0, sizeof(audio_samples_storage));
     memset(sbc_samples_storage, 0, sizeof(sbc_samples_storage));