diff --git a/esphome/components/api/api_server.h b/esphome/components/api/api_server.h
index 76d40e3ba9..528006ed02 100644
--- a/esphome/components/api/api_server.h
+++ b/esphome/components/api/api_server.h
@@ -249,7 +249,7 @@ class APIServer : public Component,
   void add_state_subscription_(std::string entity_id, optional<std::string> attribute,
                                std::function<void(const std::string &)> f, bool once);
 #endif  // USE_API_HOMEASSISTANT_STATES
-  // Socket destructor calls close() if not already closed
+  // Listen sockets use LwIPSocketImpl/BSDSocketImpl whose destructors call close()
   inline void close_socket_() {
     delete this->socket_;
     this->socket_ = nullptr;
diff --git a/esphome/components/captive_portal/dns_server_esp32_idf.h b/esphome/components/captive_portal/dns_server_esp32_idf.h
index 0f017b41f0..4d7bc958ca 100644
--- a/esphome/components/captive_portal/dns_server_esp32_idf.h
+++ b/esphome/components/captive_portal/dns_server_esp32_idf.h
@@ -14,7 +14,7 @@ class DNSServer {
   void process_next_request();
 
  protected:
-  // Socket destructor calls close() if not already closed
+  // Listen sockets use LwIPSocketImpl/BSDSocketImpl whose destructors call close()
   inline void close_socket_() {
     delete this->socket_;
     this->socket_ = nullptr;
diff --git a/esphome/components/esphome/ota/ota_esphome.cpp b/esphome/components/esphome/ota/ota_esphome.cpp
index 766469da58..baca9d17cc 100644
--- a/esphome/components/esphome/ota/ota_esphome.cpp
+++ b/esphome/components/esphome/ota/ota_esphome.cpp
@@ -36,7 +36,7 @@ void ESPHomeOTAComponent::setup() {
   int enable = 1;
   int err = this->server_->setsockopt(SOL_SOCKET, SO_REUSEADDR, &enable, sizeof(int));
   if (err != 0) {
-    ESP_LOGW(TAG, "Socket reuseaddr: errno %d", errno);
+    this->log_socket_error_(LOG_STR("reuseaddr"));
     // we can still continue
   }
   err = this->server_->setblocking(false);
@@ -452,7 +452,7 @@ void ESPHomeOTAComponent::log_remote_closed_(const LogString *during) {
 
 void ESPHomeOTAComponent::server_failed_(const LogString *msg) {
   this->log_socket_error_(msg);
-  // Socket destructor calls close() if not already closed
+  // Listen sockets use LwIPSocketImpl/BSDSocketImpl whose destructors call close()
   delete this->server_;
   this->server_ = nullptr;
   this->mark_failed();