diff --git a/components/bt/bluedroid/bta/av/bta_av_act.c b/components/bt/bluedroid/bta/av/bta_av_act.c
index 9b00d62ce..b86875870 100644
--- a/components/bt/bluedroid/bta/av/bta_av_act.c
+++ b/components/bt/bluedroid/bta/av/bta_av_act.c
@@ -1847,6 +1847,8 @@ void bta_av_dereg_comp(tBTA_AV_DATA *p_data)
 
         /* make sure that the timer is not active */
         bta_sys_stop_timer(&p_scb->timer);
+        list_free(p_scb->a2d_list);
+        p_scb->a2d_list = NULL;
         utl_freebuf((void **)&p_cb->p_scb[p_scb->hdi]);
     }
 
diff --git a/components/bt/bluedroid/btc/profile/std/a2dp/btc_a2dp_sink.c b/components/bt/bluedroid/btc/profile/std/a2dp/btc_a2dp_sink.c
index 671584448..d52391a86 100644
--- a/components/bt/bluedroid/btc/profile/std/a2dp/btc_a2dp_sink.c
+++ b/components/bt/bluedroid/btc/profile/std/a2dp/btc_a2dp_sink.c
@@ -273,7 +273,10 @@ error_exit:;
         vQueueDelete(btc_aa_snk_ctrl_queue);
         btc_aa_snk_ctrl_queue = NULL;
     }
-
+    if (btc_aa_snk_queue_set) {
+        vQueueDelete(btc_aa_snk_queue_set);
+        btc_aa_snk_queue_set = NULL;
+    }
     return false;
 }
 
@@ -292,6 +295,9 @@ void btc_a2dp_sink_shutdown(void)
 
     vQueueDelete(btc_aa_snk_ctrl_queue);
     btc_aa_snk_ctrl_queue = NULL;
+
+    vQueueDelete(btc_aa_snk_queue_set);
+    btc_aa_snk_queue_set = NULL;
 }
 
 /*****************************************************************************
diff --git a/components/bt/bluedroid/btc/profile/std/a2dp/btc_a2dp_source.c b/components/bt/bluedroid/btc/profile/std/a2dp/btc_a2dp_source.c
index d40591783..cbcce6220 100644
--- a/components/bt/bluedroid/btc/profile/std/a2dp/btc_a2dp_source.c
+++ b/components/bt/bluedroid/btc/profile/std/a2dp/btc_a2dp_source.c
@@ -348,7 +348,10 @@ error_exit:;
         vQueueDelete(btc_aa_src_ctrl_queue);
         btc_aa_src_ctrl_queue = NULL;
     }
-
+    if (btc_aa_src_queue_set) {
+        vQueueDelete(btc_aa_src_queue_set);
+        btc_aa_src_queue_set = NULL;
+    }
     return false;
 }
 
@@ -367,6 +370,9 @@ void btc_a2dp_source_shutdown(void)
 
     vQueueDelete(btc_aa_src_ctrl_queue);
     btc_aa_src_ctrl_queue = NULL;
+
+    vQueueDelete(btc_aa_src_queue_set);
+    btc_aa_src_queue_set = NULL;
 }
 
 /*****************************************************************************
diff --git a/examples/bluetooth/a2dp_sink/main/bt_app_core.c b/examples/bluetooth/a2dp_sink/main/bt_app_core.c
index 6c48d9a70..b04d5c89a 100644
--- a/examples/bluetooth/a2dp_sink/main/bt_app_core.c
+++ b/examples/bluetooth/a2dp_sink/main/bt_app_core.c
@@ -27,7 +27,7 @@ static xTaskHandle bt_app_task_handle = NULL;
 bool bt_app_work_dispatch(bt_app_cb_t p_cback, uint16_t event, void *p_params, int param_len, bt_app_copy_cb_t p_copy_cback)
 {
     ESP_LOGD(BT_APP_CORE_TAG, "%s event 0x%x, param len %d", __func__, event, param_len);
-    
+
     bt_app_msg_t msg;
     memset(&msg, 0, sizeof(bt_app_msg_t));
 
@@ -96,7 +96,7 @@ static void bt_app_task_handler(void *arg)
 void bt_app_task_start_up(void)
 {
     bt_app_task_queue = xQueueCreate(10, sizeof(bt_app_msg_t));
-    xTaskCreate(bt_app_task_handler, "BtAppT", 2048, NULL, configMAX_PRIORITIES - 3, bt_app_task_handle);
+    xTaskCreate(bt_app_task_handler, "BtAppT", 2048, NULL, configMAX_PRIORITIES - 3, &bt_app_task_handle);
     return;
 }
 
diff --git a/examples/bluetooth/a2dp_source/main/bt_app_core.c b/examples/bluetooth/a2dp_source/main/bt_app_core.c
index be699ef8a..b04d5c89a 100644
--- a/examples/bluetooth/a2dp_source/main/bt_app_core.c
+++ b/examples/bluetooth/a2dp_source/main/bt_app_core.c
@@ -96,7 +96,7 @@ static void bt_app_task_handler(void *arg)
 void bt_app_task_start_up(void)
 {
     bt_app_task_queue = xQueueCreate(10, sizeof(bt_app_msg_t));
-    xTaskCreate(bt_app_task_handler, "BtAppT", 2048, NULL, configMAX_PRIORITIES - 3, bt_app_task_handle);
+    xTaskCreate(bt_app_task_handler, "BtAppT", 2048, NULL, configMAX_PRIORITIES - 3, &bt_app_task_handle);
     return;
 }