From f26f5ae6ff8f129679f3f2b93e2b2a8a97a77d4f Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@home-assistant.io>
Date: Mon, 2 Mar 2026 13:51:04 -1000
Subject: [PATCH 1/2] [esp32_ble_client] Release services in DISCONNECTING
 timeout and add comments

---
 esphome/components/esp32_ble_client/ble_client_base.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/esphome/components/esp32_ble_client/ble_client_base.cpp b/esphome/components/esp32_ble_client/ble_client_base.cpp
index 95b87776e33..a1c38cbfaf5 100644
--- a/esphome/components/esp32_ble_client/ble_client_base.cpp
+++ b/esphome/components/esp32_ble_client/ble_client_base.cpp
@@ -67,6 +67,10 @@ void BLEClientBase::loop() {
              (millis() - this->disconnecting_started_) > DISCONNECTING_TIMEOUT) {
     ESP_LOGE(TAG, "[%d] [%s] Timeout waiting for CLOSE_EVT after disconnect, forcing IDLE", this->connection_index_,
              this->address_str_);
+    // release_services() must be called before set_idle_() — if we entered DISCONNECTING
+    // via unconditional_disconnect() (which doesn't call release_services()), and ESP-IDF
+    // never delivered CLOSE_EVT/DISCONNECT_EVT, services would leak without this call.
+    this->release_services();
     this->set_idle_();
   }
 }
@@ -230,6 +234,7 @@ void BLEClientBase::log_connection_params_(const char *param_type) {
 void BLEClientBase::handle_connection_result_(esp_err_t ret) {
   if (ret) {
     this->log_gattc_warning_("esp_ble_gattc_open", ret);
+    // Don't use set_idle_() here — CONNECT_EVT never fired so conn_id_ is still UNSET_CONN_ID.
     this->set_state(espbt::ClientState::IDLE);
   }
 }

From fb789f52b241acc8407ddeeef35fa0d6f22b7a70 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@home-assistant.io>
Date: Mon, 2 Mar 2026 14:06:11 -1000
Subject: [PATCH 2/2] nits

---
 esphome/components/esp32_ble_client/ble_client_base.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/components/esp32_ble_client/ble_client_base.h b/esphome/components/esp32_ble_client/ble_client_base.h
index b7fc772ba0d..7bc72ae765f 100644
--- a/esphome/components/esp32_ble_client/ble_client_base.h
+++ b/esphome/components/esp32_ble_client/ble_client_base.h
@@ -120,7 +120,7 @@ class BLEClientBase : public espbt::ESPBTClient, public Component {
   uint16_t conn_id_{UNSET_CONN_ID};
   uint16_t mtu_{23};
 
-  // Group 6: 1-byte types and small enums
+  // Group 7: 1-byte types and small enums
   esp_ble_addr_type_t remote_addr_type_{BLE_ADDR_TYPE_PUBLIC};
   espbt::ConnectionType connection_type_{espbt::ConnectionType::V1};
   uint8_t connection_index_;