diff --git a/components/bt/host/bluedroid/bta/av/include/bta_av_int.h b/components/bt/host/bluedroid/bta/av/include/bta_av_int.h
index cf0aba81d52..f8af2434de9 100644
--- a/components/bt/host/bluedroid/bta/av/include/bta_av_int.h
+++ b/components/bt/host/bluedroid/bta/av/include/bta_av_int.h
@@ -144,8 +144,8 @@ enum {
 
 #define BTA_AV_LAST_EVT             BTA_AV_API_SET_DELAY_VALUE_EVT
 
-/* maximum number of SEPS in stream discovery results */
-#define BTA_AV_NUM_SEPS         32
+/* maximum number of SEPS in stream discovery results (keep in sync with AVDT) */
+#define BTA_AV_NUM_SEPS         AVDT_DIS_RES_MAX_NUM_SEPS
 
 /* initialization value for AVRC handle */
 #define BTA_AV_RC_HANDLE_NONE   0xFF
diff --git a/components/bt/host/bluedroid/common/include/common/bt_target.h b/components/bt/host/bluedroid/common/include/common/bt_target.h
index d3d2d55f1fd..a7c4ecf83b0 100644
--- a/components/bt/host/bluedroid/common/include/common/bt_target.h
+++ b/components/bt/host/bluedroid/common/include/common/bt_target.h
@@ -2366,6 +2366,11 @@
 #define AVDT_NUM_SEPS               3
 #endif
 
+/* Maximum number of peer SEPs accepted in AVDTP Discover results. */
+#ifndef AVDT_DIS_RES_MAX_NUM_SEPS
+#define AVDT_DIS_RES_MAX_NUM_SEPS    32
+#endif
+
 /* Number of transport channels setup per media stream(audio or video) */
 #ifndef AVDT_NUM_CHANNELS
 
diff --git a/components/bt/host/bluedroid/stack/avdt/avdt_msg.c b/components/bt/host/bluedroid/stack/avdt/avdt_msg.c
index b5eee31792c..724bce9ad13 100644
--- a/components/bt/host/bluedroid/stack/avdt/avdt_msg.c
+++ b/components/bt/host/bluedroid/stack/avdt/avdt_msg.c
@@ -992,8 +992,8 @@ static UINT8 avdt_msg_prs_discover_rsp(tAVDT_MSG *p_msg, UINT8 *p, UINT16 len)
     if (p_msg->discover_rsp.num_seps > (len / 2)) {
         p_msg->discover_rsp.num_seps = (len / 2);
     }
-    if (p_msg->discover_rsp.num_seps > AVDT_NUM_SEPS) {
-        p_msg->discover_rsp.num_seps = AVDT_NUM_SEPS;
+    if (p_msg->discover_rsp.num_seps > AVDT_DIS_RES_MAX_NUM_SEPS) {
+        p_msg->discover_rsp.num_seps = AVDT_DIS_RES_MAX_NUM_SEPS;
     }
 
     /* parse out sep info */