diff --git a/src/classic/avdtp.c b/src/classic/avdtp.c
index 5d3471b79..7d2390132 100644
--- a/src/classic/avdtp.c
+++ b/src/classic/avdtp.c
@@ -800,7 +800,7 @@ static void avdtp_retry_timer_timeout_handler(btstack_timer_source_t * timer){
 
     if (connection->state == AVDTP_SIGNALING_CONNECTION_W2_L2CAP_RETRY){
         connection->state = AVDTP_SIGNALING_CONNECTION_W4_L2CAP_CONNECTED;
-        l2cap_create_channel(&avdtp_packet_handler, connection->remote_addr, connection->avdtp_l2cap_psm, l2cap_max_mtu(), NULL);
+        l2cap_create_channel(&avdtp_packet_handler, connection->remote_addr, connection->avdtp_l2cap_psm, AVDTP_L2CAP_MTU, NULL);
     } 
 }
 
diff --git a/src/classic/avdtp_initiator.c b/src/classic/avdtp_initiator.c
index 90a365832..36055e4e4 100644
--- a/src/classic/avdtp_initiator.c
+++ b/src/classic/avdtp_initiator.c
@@ -202,7 +202,7 @@ void avdtp_initiator_stream_config_subsm(avdtp_connection_t *connection, uint8_t
                     stream_endpoint_for_event = stream_endpoint;
                     stream_endpoint->state = AVDTP_STREAM_ENDPOINT_W4_L2CAP_FOR_MEDIA_CONNECTED;
                     connection->initiator_local_seid = stream_endpoint->sep.seid;
-                    l2cap_create_channel(avdtp_packet_handler, connection->remote_addr, BLUETOOTH_PSM_AVDTP, 0xffff, NULL);
+                    l2cap_create_channel(avdtp_packet_handler, connection->remote_addr, BLUETOOTH_PSM_AVDTP, AVDTP_L2CAP_MTU, NULL);
                     return;
                 case AVDTP_SI_START:
                     if (!stream_endpoint){