diff --git a/net/tcp/tcp_conn.c b/net/tcp/tcp_conn.c
index 1c2b3594783..487ab0829b5 100644
--- a/net/tcp/tcp_conn.c
+++ b/net/tcp/tcp_conn.c
@@ -1240,9 +1240,18 @@ int tcp_connect(FAR struct tcp_conn_s *conn, FAR const struct sockaddr *addr)
       conn->mss    = MIN_IPv4_TCP_INITIAL_MSS;
       conn->rport  = inaddr->sin_port;
 
-      /* The sockaddr address is 32-bits in network order. */
+      /* The sockaddr address is 32-bits in network order.
+       * Note: 0.0.0.0 is mapped to 127.0.0.1 by convention.
+       */
 
-      net_ipv4addr_copy(conn->u.ipv4.raddr, inaddr->sin_addr.s_addr);
+      if (inaddr->sin_addr.s_addr == INADDR_ANY)
+        {
+          net_ipv4addr_copy(conn->u.ipv4.raddr, HTONL(INADDR_LOOPBACK));
+        }
+      else
+        {
+          net_ipv4addr_copy(conn->u.ipv4.raddr, inaddr->sin_addr.s_addr);
+        }
 
       /* Find the device that can receive packets on the network associated
        * with this remote address.
@@ -1265,9 +1274,20 @@ int tcp_connect(FAR struct tcp_conn_s *conn, FAR const struct sockaddr *addr)
       conn->mss     = MIN_IPv6_TCP_INITIAL_MSS;
       conn->rport   = inaddr->sin6_port;
 
-      /* The sockaddr address is 128-bits in network order. */
+      /* The sockaddr address is 128-bits in network order.
+       * Note: ::0 is mapped to ::1 by convention.
+       */
 
-      net_ipv6addr_copy(conn->u.ipv6.raddr, inaddr->sin6_addr.s6_addr16);
+      if (net_ipv6addr_cmp(addr, g_ipv6_unspecaddr))
+        {
+          struct in6_addr loopback_sin6_addr = IN6ADDR_LOOPBACK_INIT;
+          net_ipv6addr_copy(conn->u.ipv6.raddr,
+                            loopback_sin6_addr.s6_addr16);
+        }
+      else
+        {
+          net_ipv6addr_copy(conn->u.ipv6.raddr, inaddr->sin6_addr.s6_addr16);
+        }
 
       /* Find the device that can receive packets on the network associated
        * with this local address.
diff --git a/net/udp/udp_conn.c b/net/udp/udp_conn.c
index 0484b6abecb..3e39d82ed56 100644
--- a/net/udp/udp_conn.c
+++ b/net/udp/udp_conn.c
@@ -902,7 +902,17 @@ int udp_connect(FAR struct udp_conn_s *conn, FAR const struct sockaddr *addr)
             (FAR const struct sockaddr_in *)addr;
 
           conn->rport = inaddr->sin_port;
-          net_ipv4addr_copy(conn->u.ipv4.raddr, inaddr->sin_addr.s_addr);
+
+          /* Note: 0.0.0.0 is mapped to 127.0.0.1 by convention. */
+
+          if (inaddr->sin_addr.s_addr == INADDR_ANY)
+            {
+              net_ipv4addr_copy(conn->u.ipv4.raddr, HTONL(INADDR_LOOPBACK));
+            }
+          else
+            {
+              net_ipv4addr_copy(conn->u.ipv4.raddr, inaddr->sin_addr.s_addr);
+            }
         }
 #endif /* CONFIG_NET_IPv4 */
 
@@ -915,7 +925,20 @@ int udp_connect(FAR struct udp_conn_s *conn, FAR const struct sockaddr *addr)
             (FAR const struct sockaddr_in6 *)addr;
 
           conn->rport = inaddr->sin6_port;
-          net_ipv6addr_copy(conn->u.ipv6.raddr, inaddr->sin6_addr.s6_addr16);
+
+          /* Note: ::0 is mapped to ::1 by convention. */
+
+          if (net_ipv6addr_cmp(addr, g_ipv6_unspecaddr))
+            {
+              struct in6_addr loopback_sin6_addr = IN6ADDR_LOOPBACK_INIT;
+              net_ipv6addr_copy(conn->u.ipv6.raddr,
+                                loopback_sin6_addr.s6_addr16);
+            }
+          else
+            {
+              net_ipv6addr_copy(conn->u.ipv6.raddr,
+                                inaddr->sin6_addr.s6_addr16);
+            }
         }
 #endif /* CONFIG_NET_IPv6 */
     }