diff --git a/libs/libc/pthread/pthread_mutexattr_setrobust.c b/libs/libc/pthread/pthread_mutexattr_setrobust.c
index 5367a15b3a..86dd7228cb 100644
--- a/libs/libc/pthread/pthread_mutexattr_setrobust.c
+++ b/libs/libc/pthread/pthread_mutexattr_setrobust.c
@@ -62,7 +62,7 @@ int pthread_mutexattr_setrobust(pthread_mutexattr_t *attr, int robust)
 #elif defined(CONFIG_PTHREAD_MUTEX_BOTH)
 
   if (attr != NULL && (robust == PTHREAD_MUTEX_STALLED ||
-      robust == _PTHREAD_MFLAGS_ROBUST))
+      robust == PTHREAD_MUTEX_ROBUST))
     {
       attr->robust = robust;
       return OK;
diff --git a/sched/pthread/pthread_mutexinit.c b/sched/pthread/pthread_mutexinit.c
index 95da3f4685..c1956a09ec 100644
--- a/sched/pthread/pthread_mutexinit.c
+++ b/sched/pthread/pthread_mutexinit.c
@@ -69,9 +69,9 @@ int pthread_mutex_init(FAR pthread_mutex_t *mutex,
 #endif
 #ifndef CONFIG_PTHREAD_MUTEX_UNSAFE
 #ifdef CONFIG_PTHREAD_MUTEX_DEFAULT_UNSAFE
-  uint8_t robust = PTHREAD_MUTEX_STALLED;
+  uint8_t flags = 0;
 #else
-  uint8_t robust = PTHREAD_MUTEX_ROBUST;
+  uint8_t flags = _PTHREAD_MFLAGS_ROBUST;
 #endif
 #endif
   int ret = OK;
@@ -97,7 +97,8 @@ int pthread_mutex_init(FAR pthread_mutex_t *mutex,
           type    = attr->type;
 #endif
 #ifdef CONFIG_PTHREAD_MUTEX_BOTH
-          robust  = attr->robust;
+          flags  = attr->robust == PTHREAD_MUTEX_ROBUST ?
+                   _PTHREAD_MFLAGS_ROBUST : 0;
 #endif
         }
 
@@ -127,8 +128,8 @@ int pthread_mutex_init(FAR pthread_mutex_t *mutex,
       /* Initial internal fields of the mutex */
 
       mutex->flink  = NULL;
-      mutex->flags  = (robust == PTHREAD_MUTEX_ROBUST ?
-                       _PTHREAD_MFLAGS_ROBUST : 0);
+
+      mutex->flags  = flags;
 #endif
 
 #ifdef CONFIG_PTHREAD_MUTEX_TYPES