diff --git a/net/socket/getsockopt.c b/net/socket/getsockopt.c
index 0fcf6fbe20c..d14586fdeb7 100644
--- a/net/socket/getsockopt.c
+++ b/net/socket/getsockopt.c
@@ -141,7 +141,8 @@ static int psock_socketlevel_option(FAR struct socket *psock, int option,
           net_dsec2timeval(timeo, (struct timeval *)value);
           *value_len   = sizeof(struct timeval);
         }
-        break;
+
+      return OK;
     }
 
 #ifdef CONFIG_NET_USRSOCK
diff --git a/net/socket/setsockopt.c b/net/socket/setsockopt.c
index 95e358993b4..53d2748d50b 100644
--- a/net/socket/setsockopt.c
+++ b/net/socket/setsockopt.c
@@ -148,13 +148,14 @@ static int psock_socketlevel_option(FAR struct socket *psock, int option,
               _SO_SETOPT(psock->s_options, option);
             }
         }
-        break;
+
+        return OK;
     }
 
 #ifdef CONFIG_NET_USRSOCK
     if (psock->s_type == SOCK_USRSOCK_TYPE)
       {
-      return -ENOPROTOOPT;
+        return -ENOPROTOOPT;
       }
 #endif