diff --git a/esphome/components/graph/graph.cpp b/esphome/components/graph/graph.cpp
index 88bb306408..e3b9119108 100644
--- a/esphome/components/graph/graph.cpp
+++ b/esphome/components/graph/graph.cpp
@@ -337,7 +337,7 @@ void Graph::draw_legend(display::Display *buff, uint16_t x_offset, uint16_t y_of
     return;
 
   /// Plot border
-  if (this->border_) {
+  if (legend_->border_) {
     int w = legend_->width_;
     int h = legend_->height_;
     buff->horizontal_line(x_offset, y_offset, w, color);
diff --git a/esphome/components/socket/socket.cpp b/esphome/components/socket/socket.cpp
index 1c8e72b8fd..cc9232d21a 100644
--- a/esphome/components/socket/socket.cpp
+++ b/esphome/components/socket/socket.cpp
@@ -61,9 +61,18 @@ socklen_t set_sockaddr(struct sockaddr *addr, socklen_t addrlen, const std::stri
     server->sin6_family = AF_INET6;
     server->sin6_port = htons(port);
 
+#ifdef USE_SOCKET_IMPL_BSD_SOCKETS
+    // Use standard inet_pton for BSD sockets
+    if (inet_pton(AF_INET6, ip_address.c_str(), &server->sin6_addr) != 1) {
+      errno = EINVAL;
+      return 0;
+    }
+#else
+    // Use LWIP-specific functions
     ip6_addr_t ip6;
     inet6_aton(ip_address.c_str(), &ip6);
     memcpy(server->sin6_addr.un.u32_addr, ip6.addr, sizeof(ip6.addr));
+#endif
     return sizeof(sockaddr_in6);
   }
 #endif /* USE_NETWORK_IPV6 */