diff --git a/hal/socket/bsd/socket_bsd.c b/hal/socket/bsd/socket_bsd.c
index bd696dc8..74fbc1e7 100644
--- a/hal/socket/bsd/socket_bsd.c
+++ b/hal/socket/bsd/socket_bsd.c
@@ -278,6 +278,8 @@ ServerSocket_accept(ServerSocket self)
         if (conSocket) {
             conSocket->fd = fd;
 
+            setSocketNonBlocking(conSocket);
+
             activateTcpNoDelay(conSocket);
         }
         else {