diff --git a/components/bt/bt.c b/components/bt/bt.c
index 434f69a617..e0871e0c37 100644
--- a/components/bt/bt.c
+++ b/components/bt/bt.c
@@ -923,19 +923,15 @@ static void btdm_wakeup_request_callback(void * arg)
 
 static bool async_wakeup_request(int event)
 {
-    bool request_lock = false;
     bool do_wakeup_request = false;
 
     switch (event) {
         case BTDM_ASYNC_WAKEUP_REQ_HCI:
-            request_lock = true;
+            btdm_in_wakeup_requesting_set(true);
             // NO break
         case BTDM_ASYNC_WAKEUP_REQ_CTRL_DISA:
             if (!btdm_power_state_active()) {
                 do_wakeup_request = true;
-                if (request_lock) {
-                    btdm_in_wakeup_requesting_set(true);
-                }
 
                 btdm_dispatch_work_to_controller(btdm_wakeup_request_callback, NULL, true);
                 semphr_take_wrapper(s_wakeup_req_sem, OSI_FUNCS_TIME_BLOCKING);
@@ -1001,13 +997,11 @@ bool esp_vhci_host_check_send_available(void)
 
 void esp_vhci_host_send_packet(uint8_t *data, uint16_t len)
 {
-    bool do_wakeup_request = async_wakeup_request(BTDM_ASYNC_WAKEUP_REQ_HCI);
+    async_wakeup_request(BTDM_ASYNC_WAKEUP_REQ_HCI);
 
     API_vhci_host_send_packet(data, len);
 
-    if (do_wakeup_request) {
-        async_wakeup_request_end(BTDM_ASYNC_WAKEUP_REQ_HCI);
-    }
+    async_wakeup_request_end(BTDM_ASYNC_WAKEUP_REQ_HCI);
 }
 
 esp_err_t esp_vhci_host_register_callback(const esp_vhci_host_callback_t *callback)
diff --git a/components/bt/lib b/components/bt/lib
index 5df78c6bd0..355b55faf2 160000
--- a/components/bt/lib
+++ b/components/bt/lib
@@ -1 +1 @@
-Subproject commit 5df78c6bd02191b6686c9d277af45b97bd4b10a5
+Subproject commit 355b55faf2b2ebdd6ca58f79657f468d1e66fa0c
diff --git a/components/esp32/lib b/components/esp32/lib
index 80d7f67aab..74336ed320 160000
--- a/components/esp32/lib
+++ b/components/esp32/lib
@@ -1 +1 @@
-Subproject commit 80d7f67aab9dc7331300476192a25fecc31e364f
+Subproject commit 74336ed3201f3781ef8347f773621e9a096b6ed0