diff --git a/libs/libc/semaphore/sem_post.c b/libs/libc/semaphore/sem_post.c
index d31f4b77763..0aafd7a94dc 100644
--- a/libs/libc/semaphore/sem_post.c
+++ b/libs/libc/semaphore/sem_post.c
@@ -128,9 +128,9 @@ int nxsem_post(FAR sem_t *sem)
 
 #ifndef CONFIG_LIBC_ARCH_ATOMIC
 
-  if ((sem->flags & SEM_TYPE_MUTEX)
-#  if defined(CONFIG_PRIORITY_PROTECT) || defined(CONFIG_PRIORITY_INHERITANCE)
-      && (sem->flags & SEM_PRIO_MASK) == SEM_PRIO_NONE
+  if (NXSEM_IS_MUTEX(sem)
+#  ifdef CONFIG_PRIORITY_PROTECT
+      && (sem->flags & SEM_PRIO_MASK) != SEM_PRIO_PROTECT
 #  endif
       )
     {
diff --git a/libs/libc/semaphore/sem_trywait.c b/libs/libc/semaphore/sem_trywait.c
index 1dabd77b8d8..e8363c82327 100644
--- a/libs/libc/semaphore/sem_trywait.c
+++ b/libs/libc/semaphore/sem_trywait.c
@@ -123,10 +123,10 @@ int nxsem_trywait(FAR sem_t *sem)
 
 #ifndef CONFIG_LIBC_ARCH_ATOMIC
 
-  if ((sem->flags & SEM_TYPE_MUTEX)
-#if defined(CONFIG_PRIORITY_PROTECT) || defined(CONFIG_PRIORITY_INHERITANCE)
-      && (sem->flags & SEM_PRIO_MASK) == SEM_PRIO_NONE
-#endif
+  if (NXSEM_IS_MUTEX(sem)
+#  ifdef CONFIG_PRIORITY_PROTECT
+      && (sem->flags & SEM_PRIO_MASK) != SEM_PRIO_PROTECT
+#  endif
       )
     {
       int32_t tid = _SCHED_GETTID();
diff --git a/libs/libc/semaphore/sem_wait.c b/libs/libc/semaphore/sem_wait.c
index 1b099fd244e..d936fbf025e 100644
--- a/libs/libc/semaphore/sem_wait.c
+++ b/libs/libc/semaphore/sem_wait.c
@@ -151,9 +151,9 @@ int nxsem_wait(FAR sem_t *sem)
 
 #ifndef CONFIG_LIBC_ARCH_ATOMIC
 
-  if ((sem->flags & SEM_TYPE_MUTEX)
-#  if defined(CONFIG_PRIORITY_PROTECT) || defined(CONFIG_PRIORITY_INHERITANCE)
-      && (sem->flags & SEM_PRIO_MASK) == SEM_PRIO_NONE
+  if (NXSEM_IS_MUTEX(sem)
+#  ifdef CONFIG_PRIORITY_PROTECT
+      && (sem->flags & SEM_PRIO_MASK) != SEM_PRIO_PROTECT
 #  endif
       )
     {