diff --git a/fs/socket/socket.c b/fs/socket/socket.c
index 1245c79a53..4ca9f2a9a1 100644
--- a/fs/socket/socket.c
+++ b/fs/socket/socket.c
@@ -261,6 +261,11 @@ int socket(int domain, int type, int protocol)
       oflags |= O_CLOEXEC;
     }
 
+  if (type & SOCK_NONBLOCK)
+    {
+      oflags |= O_NONBLOCK;
+    }
+
   psock = kmm_zalloc(sizeof(*psock));
   if (psock == NULL)
     {