diff --git a/net/socket/getsockopt.c b/net/socket/getsockopt.c
index f2f45e73e2b..e2f815b55c9 100644
--- a/net/socket/getsockopt.c
+++ b/net/socket/getsockopt.c
@@ -33,6 +33,7 @@
 #include <errno.h>
 
 #include "socket/socket.h"
+#include "usrsock/usrsock.h"
 #include "utils/utils.h"
 
 /****************************************************************************
@@ -123,9 +124,19 @@ static int psock_socketlevel_option(FAR struct socket *psock, int option,
 
           net_dsec2timeval(timeo, (struct timeval *)value);
           *value_len   = sizeof(struct timeval);
+          return OK;
         }
-        break;
+    }
 
+#ifdef CONFIG_NET_USRSOCK
+  if (psock->s_type == SOCK_USRSOCK_TYPE)
+    {
+      return -ENOPROTOOPT;
+    }
+#endif
+
+  switch (option)
+    {
       case SO_ACCEPTCONN: /* Reports whether socket listening is enabled */
         {
           if (*value_len < sizeof(int))
diff --git a/net/socket/setsockopt.c b/net/socket/setsockopt.c
index a7ede257444..e2a13af450a 100644
--- a/net/socket/setsockopt.c
+++ b/net/socket/setsockopt.c
@@ -38,6 +38,7 @@
 #include <netdev/netdev.h>
 
 #include "socket/socket.h"
+#include "usrsock/usrsock.h"
 #include "utils/utils.h"
 
 /****************************************************************************
@@ -130,9 +131,20 @@ static int psock_socketlevel_option(FAR struct socket *psock, int option,
             {
               _SO_SETOPT(conn->s_options, option);
             }
-        }
-        break;
 
+          return OK;
+        }
+    }
+
+#ifdef CONFIG_NET_USRSOCK
+  if (psock->s_type == SOCK_USRSOCK_TYPE)
+    {
+      return -ENOPROTOOPT;
+    }
+#endif
+
+  switch (option)
+    {
       case SO_BROADCAST:  /* Permits sending of broadcast messages */
       case SO_DEBUG:      /* Enables recording of debugging information */
       case SO_DONTROUTE:  /* Requests outgoing messages bypass standard routing */
diff --git a/net/usrsock/usrsock_getsockopt.c b/net/usrsock/usrsock_getsockopt.c
index 07f57a26e8f..393f79dd205 100644
--- a/net/usrsock/usrsock_getsockopt.c
+++ b/net/usrsock/usrsock_getsockopt.c
@@ -189,7 +189,7 @@ int usrsock_getsockopt(FAR struct socket *psock, int level, int option,
           *value_len = sizeof(int);
           return OK;
         }
-      else
+      else if (option == SO_RCVTIMEO || option == SO_SNDTIMEO)
         {
           return -ENOPROTOOPT;
         }
diff --git a/net/usrsock/usrsock_setsockopt.c b/net/usrsock/usrsock_setsockopt.c
index 922da98e271..3fc2c16c13b 100644
--- a/net/usrsock/usrsock_setsockopt.c
+++ b/net/usrsock/usrsock_setsockopt.c
@@ -174,10 +174,6 @@ int usrsock_setsockopt(FAR struct socket *psock, int level, int option,
         {
           return -ENOPROTOOPT;
         }
-      else
-        {
-          return -EINVAL;
-        }
     }
 
   net_lock();