diff --git a/esphome/components/esphome/ota/ota_esphome.cpp b/esphome/components/esphome/ota/ota_esphome.cpp
index f9984e1425..49f77fff23 100644
--- a/esphome/components/esphome/ota/ota_esphome.cpp
+++ b/esphome/components/esphome/ota/ota_esphome.cpp
@@ -9,6 +9,7 @@
 #endif
 #endif
 #include "esphome/components/network/util.h"
+#include "esphome/components/socket/socket.h"
 #include "esphome/components/ota/ota_backend.h"
 #include "esphome/components/ota/ota_backend_esp8266.h"
 #include "esphome/components/ota/ota_backend_arduino_libretiny.h"
@@ -465,7 +466,9 @@ void ESPHomeOTAComponent::log_socket_error_(const LogString *msg) {
 void ESPHomeOTAComponent::log_read_error_(const LogString *what) { ESP_LOGW(TAG, "Read %s failed", LOG_STR_ARG(what)); }
 
 void ESPHomeOTAComponent::log_start_(const LogString *phase) {
-  ESP_LOGD(TAG, "Starting %s from %s", LOG_STR_ARG(phase), this->client_->getpeername().c_str());
+  char peername[socket::PEERNAME_MAX_LEN];
+  this->client_->getpeername_to(peername);
+  ESP_LOGD(TAG, "Starting %s from %s", LOG_STR_ARG(phase), peername);
 }
 
 void ESPHomeOTAComponent::log_remote_closed_(const LogString *during) {
diff --git a/esphome/components/socket/bsd_sockets_impl.cpp b/esphome/components/socket/bsd_sockets_impl.cpp
index d3a44f573d..a064dc77ea 100644
--- a/esphome/components/socket/bsd_sockets_impl.cpp
+++ b/esphome/components/socket/bsd_sockets_impl.cpp
@@ -100,7 +100,7 @@ class BSDSocketImpl : public Socket {
   int getpeername(struct sockaddr *addr, socklen_t *addrlen) override {
     return ::getpeername(this->fd_, addr, addrlen);
   }
-  std::string getpeername() override {
+  std::string getpeername() final {
     struct sockaddr_storage storage;
     socklen_t len = sizeof(storage);
     if (::getpeername(this->fd_, (struct sockaddr *) &storage, &len) != 0)
@@ -119,7 +119,7 @@ class BSDSocketImpl : public Socket {
   int getsockname(struct sockaddr *addr, socklen_t *addrlen) override {
     return ::getsockname(this->fd_, addr, addrlen);
   }
-  std::string getsockname() override {
+  std::string getsockname() final {
     struct sockaddr_storage storage;
     socklen_t len = sizeof(storage);
     if (::getsockname(this->fd_, (struct sockaddr *) &storage, &len) != 0)
diff --git a/esphome/components/socket/lwip_raw_tcp_impl.cpp b/esphome/components/socket/lwip_raw_tcp_impl.cpp
index 671d5c94bb..db9f075ee6 100644
--- a/esphome/components/socket/lwip_raw_tcp_impl.cpp
+++ b/esphome/components/socket/lwip_raw_tcp_impl.cpp
@@ -189,7 +189,7 @@ class LWIPRawImpl : public Socket {
     }
     return this->ip2sockaddr_(&pcb_->remote_ip, pcb_->remote_port, name, addrlen);
   }
-  std::string getpeername() override {
+  std::string getpeername() final {
     if (pcb_ == nullptr) {
       errno = ECONNRESET;
       return "";
@@ -215,7 +215,7 @@ class LWIPRawImpl : public Socket {
     }
     return this->ip2sockaddr_(&pcb_->local_ip, pcb_->local_port, name, addrlen);
   }
-  std::string getsockname() override {
+  std::string getsockname() final {
     if (pcb_ == nullptr) {
       errno = ECONNRESET;
       return "";
diff --git a/esphome/components/socket/lwip_sockets_impl.cpp b/esphome/components/socket/lwip_sockets_impl.cpp
index 8a694d26b0..bf055258ff 100644
--- a/esphome/components/socket/lwip_sockets_impl.cpp
+++ b/esphome/components/socket/lwip_sockets_impl.cpp
@@ -99,7 +99,7 @@ class LwIPSocketImpl : public Socket {
   int getpeername(struct sockaddr *addr, socklen_t *addrlen) override {
     return lwip_getpeername(this->fd_, addr, addrlen);
   }
-  std::string getpeername() override {
+  std::string getpeername() final {
     struct sockaddr_storage storage;
     socklen_t len = sizeof(storage);
     if (lwip_getpeername(this->fd_, (struct sockaddr *) &storage, &len) != 0)
@@ -118,7 +118,7 @@ class LwIPSocketImpl : public Socket {
   int getsockname(struct sockaddr *addr, socklen_t *addrlen) override {
     return lwip_getsockname(this->fd_, addr, addrlen);
   }
-  std::string getsockname() override {
+  std::string getsockname() final {
     struct sockaddr_storage storage;
     socklen_t len = sizeof(storage);
     if (lwip_getsockname(this->fd_, (struct sockaddr *) &storage, &len) != 0)