diff --git a/components/bt/controller/lib_esp32 b/components/bt/controller/lib_esp32
index 19fa60b819..03bfbf0a68 160000
--- a/components/bt/controller/lib_esp32
+++ b/components/bt/controller/lib_esp32
@@ -1 +1 @@
-Subproject commit 19fa60b819db1e3bb8a07790f819b69657e4ae3f
+Subproject commit 03bfbf0a689e268309e496a1a0bb248ddab2c808
diff --git a/components/bt/host/bluedroid/api/esp_gap_bt_api.c b/components/bt/host/bluedroid/api/esp_gap_bt_api.c
index 4088172f66..4bf58a6b8e 100644
--- a/components/bt/host/bluedroid/api/esp_gap_bt_api.c
+++ b/components/bt/host/bluedroid/api/esp_gap_bt_api.c
@@ -420,6 +420,10 @@ esp_err_t esp_bt_gap_set_qos(esp_bd_addr_t remote_bda, uint32_t t_poll)
         return ESP_ERR_INVALID_STATE;
     }
 
+    if (t_poll < ESP_BT_GAP_TPOLL_MIN || t_poll > ESP_BT_GAP_TPOLL_MAX) {
+        return ESP_ERR_INVALID_ARG;
+    }
+
     msg.sig = BTC_SIG_API_CALL;
     msg.pid = BTC_PID_GAP_BT;
     msg.act = BTC_GAP_BT_ACT_SET_QOS;
diff --git a/components/bt/host/bluedroid/api/include/api/esp_gap_bt_api.h b/components/bt/host/bluedroid/api/include/api/esp_gap_bt_api.h
index b5203e29ff..8e3eb587ab 100644
--- a/components/bt/host/bluedroid/api/include/api/esp_gap_bt_api.h
+++ b/components/bt/host/bluedroid/api/include/api/esp_gap_bt_api.h
@@ -238,6 +238,11 @@ typedef enum {
 #define ESP_BT_GAP_MIN_INQ_LEN                (0x01)  /*!< Minimum inquiry duration, unit is 1.28s */
 #define ESP_BT_GAP_MAX_INQ_LEN                (0x30)  /*!< Maximum inquiry duration, unit is 1.28s */
 
+/** Minimum, Default and Maximum poll interval **/
+#define ESP_BT_GAP_TPOLL_MIN                  (0x0006) /*!< Minimum poll interval, unit is 625 microseconds */
+#define ESP_BT_GAP_TPOLL_DFT                  (0x0028) /*!< Default poll interval, unit is 625 microseconds */
+#define ESP_BT_GAP_TPOLL_MAX                  (0x1000) /*!< Maximum poll interval, unit is 625 microseconds */
+
 /// GAP state callback parameters
 typedef union {
     /**
diff --git a/components/bt/host/bluedroid/bta/dm/bta_dm_qos.c b/components/bt/host/bluedroid/bta/dm/bta_dm_qos.c
index 1239bae1f9..19a31b9449 100644
--- a/components/bt/host/bluedroid/bta/dm/bta_dm_qos.c
+++ b/components/bt/host/bluedroid/bta/dm/bta_dm_qos.c
@@ -34,13 +34,13 @@
 void bta_dm_set_qos(tBTA_DM_MSG *p_data)
 {
     FLOW_SPEC p_flow = {
-        .qos_flags = 0,          /* TBD */
-        .service_type = GUARANTEED,      /* see below */
-        .token_rate = 0,         /* bytes/second */
-        .token_bucket_size = 0,  /* bytes */
-        .peak_bandwidth = 0,      /* bytes/second */
-        .latency = 625 * p_data->qos_set.t_poll,           /* microseconds */
-        .delay_variation = 0xFFFFFFFF    /* microseconds */
+        .qos_flags = 0,                             /* TBD */
+        .service_type = NO_TRAFFIC,                 /* service_type */
+        .token_rate = 0,                            /* bytes/second */
+        .token_bucket_size = 0,                     /* bytes */
+        .peak_bandwidth = 0,                        /* bytes/second */
+        .latency = 625 * p_data->qos_set.t_poll,    /* microseconds */
+        .delay_variation = 0xFFFFFFFF               /* microseconds */
     };
 
     tBTM_STATUS status = BTM_SetQoS (p_data->qos_set.bd_addr, &p_flow, p_data->qos_set.p_cb);