diff --git a/net/Kconfig b/net/Kconfig
index bb7d7c8c1b..cbe807a50a 100644
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -59,12 +59,14 @@ config NET_PROMISCUOUS
 
 config NET_DEFAULT_MIN_PORT
 	int "Net Default Min Port"
+	range 1 65535
 	default 4096
 	---help---
 		Default Network min port
 
 config NET_DEFAULT_MAX_PORT
 	int "Net Default Max Port"
+	range NET_DEFAULT_MIN_PORT 65535
 	default 32000
 	---help---
 		Default Network max port
diff --git a/net/nat/ipv4_nat_entry.c b/net/nat/ipv4_nat_entry.c
index 4deccad416..8f2624a5f9 100644
--- a/net/nat/ipv4_nat_entry.c
+++ b/net/nat/ipv4_nat_entry.c
@@ -110,7 +110,9 @@ static uint16_t ipv4_nat_select_port_without_stack(
   uint16_t hport = NTOHS(portno);
   while (ipv4_nat_port_inuse(protocol, ip, portno))
     {
-      if (++hport >= CONFIG_NET_DEFAULT_MAX_PORT)
+      ++hport;
+      if (hport >= CONFIG_NET_DEFAULT_MAX_PORT ||
+          hport < CONFIG_NET_DEFAULT_MIN_PORT)
         {
           hport = CONFIG_NET_DEFAULT_MIN_PORT;
         }
@@ -200,7 +202,9 @@ static uint16_t ipv4_nat_select_port(FAR struct net_driver_s *dev,
           while (icmp_findconn(dev, id) ||
                  ipv4_nat_port_inuse(IP_PROTO_ICMP, dev->d_ipaddr, id))
             {
-              if (++hid >= CONFIG_NET_DEFAULT_MAX_PORT)
+              ++hid;
+              if (hid >= CONFIG_NET_DEFAULT_MAX_PORT ||
+                  hid < CONFIG_NET_DEFAULT_MIN_PORT)
                 {
                   hid = CONFIG_NET_DEFAULT_MIN_PORT;
                 }
diff --git a/net/tcp/tcp_conn.c b/net/tcp/tcp_conn.c
index c540170201..4d7fbf98a3 100644
--- a/net/tcp/tcp_conn.c
+++ b/net/tcp/tcp_conn.c
@@ -585,12 +585,10 @@ int tcp_selectport(uint8_t domain,
     {
       net_getrandom(&g_last_tcp_port, sizeof(uint16_t));
 
-      g_last_tcp_port = g_last_tcp_port % CONFIG_NET_DEFAULT_MAX_PORT;
-
-      if (g_last_tcp_port < CONFIG_NET_DEFAULT_MIN_PORT)
-        {
-          g_last_tcp_port += CONFIG_NET_DEFAULT_MIN_PORT;
-        }
+      g_last_tcp_port = g_last_tcp_port %
+                        (CONFIG_NET_DEFAULT_MAX_PORT -
+                         CONFIG_NET_DEFAULT_MIN_PORT + 1);
+      g_last_tcp_port += CONFIG_NET_DEFAULT_MIN_PORT;
     }
 
   if (portno == 0)
@@ -608,7 +606,10 @@ int tcp_selectport(uint8_t domain,
            * is within range.
            */
 
-          if (++g_last_tcp_port >= CONFIG_NET_DEFAULT_MAX_PORT)
+          ++g_last_tcp_port;
+
+          if (g_last_tcp_port > CONFIG_NET_DEFAULT_MAX_PORT ||
+              g_last_tcp_port < CONFIG_NET_DEFAULT_MIN_PORT)
             {
               g_last_tcp_port = CONFIG_NET_DEFAULT_MIN_PORT;
             }
diff --git a/net/udp/udp_conn.c b/net/udp/udp_conn.c
index d940e03368..1e9b09ab8d 100644
--- a/net/udp/udp_conn.c
+++ b/net/udp/udp_conn.c
@@ -540,12 +540,10 @@ uint16_t udp_select_port(uint8_t domain, FAR union ip_binding_u *u)
 
   if (g_last_udp_port == 0)
     {
-      g_last_udp_port = clock_systime_ticks() % CONFIG_NET_DEFAULT_MAX_PORT;
-
-      if (g_last_udp_port < CONFIG_NET_DEFAULT_MIN_PORT)
-        {
-          g_last_udp_port += CONFIG_NET_DEFAULT_MIN_PORT;
-        }
+      g_last_udp_port = clock_systime_ticks() %
+                        (CONFIG_NET_DEFAULT_MAX_PORT -
+                         CONFIG_NET_DEFAULT_MIN_PORT + 1);
+      g_last_udp_port += CONFIG_NET_DEFAULT_MIN_PORT;
     }
 
   /* Find an unused local port number.  Loop until we find a valid
@@ -562,7 +560,8 @@ uint16_t udp_select_port(uint8_t domain, FAR union ip_binding_u *u)
 
       /* Make sure that the port number is within range */
 
-      if (g_last_udp_port >= CONFIG_NET_DEFAULT_MAX_PORT)
+      if (g_last_udp_port > CONFIG_NET_DEFAULT_MAX_PORT ||
+          g_last_udp_port < CONFIG_NET_DEFAULT_MIN_PORT)
         {
           g_last_udp_port = CONFIG_NET_DEFAULT_MIN_PORT;
         }