From 3c57064bf26afd1fcc0c4ad8d8310a8c15a8c324 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@home-assistant.io>
Date: Sun, 9 Aug 2026 13:45:33 -0500
Subject: [PATCH] Address review: skip table materialization when no node will
 read it

A client with only connect/disconnect automations paid the build/free
cycle on every reconnect for nothing - post-setup heap churn on the
Bluedroid direct-consumer path. release_services() stays unconditional.
---
 .../components/ble_client/ble_client_gatt.cpp | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/esphome/components/ble_client/ble_client_gatt.cpp b/esphome/components/ble_client/ble_client_gatt.cpp
index deb8801e3c..2dbe713f0d 100644
--- a/esphome/components/ble_client/ble_client_gatt.cpp
+++ b/esphome/components/ble_client/ble_client_gatt.cpp
@@ -155,15 +155,19 @@ void BLEClient::on_service_discovery_done(int error) {
   // CONNECTED before the fan-out so nodes may consult connected() from
   // their own on_connected().
   this->state_ = State::CONNECTED;
-  auto table = this->backend_->get_service_table();
-  for (auto *node : this->nodes_) {
-    node->on_connected(table);
-    if (this->state_ != State::CONNECTED) {
-      // A node tore the link down mid-fan-out: on_disconnect fires with no
-      // preceding on_connect, so leave a trace of why.
-      ESP_LOGW(TAG, "[%s] A node aborted the connection during setup", this->address_str_);
-      this->backend_->release_services();
-      return;
+  if (!this->nodes_.empty()) {
+    // Materialize only when a node will read it: a client with no nodes
+    // would pay the build/free cycle on every (re)connect for nothing.
+    auto table = this->backend_->get_service_table();
+    for (auto *node : this->nodes_) {
+      node->on_connected(table);
+      if (this->state_ != State::CONNECTED) {
+        // A node tore the link down mid-fan-out: on_disconnect fires with no
+        // preceding on_connect, so leave a trace of why.
+        ESP_LOGW(TAG, "[%s] A node aborted the connection during setup", this->address_str_);
+        this->backend_->release_services();
+        return;
+      }
     }
   }
   this->backend_->release_services();