diff --git a/net/tcp/Kconfig b/net/tcp/Kconfig
index 8b4a2f0a90..fd2bcec121 100644
--- a/net/tcp/Kconfig
+++ b/net/tcp/Kconfig
@@ -99,7 +99,7 @@ config NET_TCP_MAX_CONNS
 
 config NET_TCP_NPOLLWAITERS
 	int "Number of TCP poll waiters"
-	default 1
+	default 2
 
 config NET_TCP_RTO
 	int "RTO of TCP/IP connections"
diff --git a/net/tcp/tcp_netpoll.c b/net/tcp/tcp_netpoll.c
index f31077bcf5..bbcd98b9fe 100644
--- a/net/tcp/tcp_netpoll.c
+++ b/net/tcp/tcp_netpoll.c
@@ -230,6 +230,7 @@ int tcp_pollsetup(FAR struct socket *psock, FAR struct pollfd *fds)
   info = conn->pollinfo;
   while (info->conn != NULL)
     {
+      DEBUGASSERT((fds->events & info->fds->events) != 0);
       if (++info >= &conn->pollinfo[CONFIG_NET_TCP_NPOLLWAITERS])
         {
           DEBUGPANIC();