diff --git a/sched/mqueue/mq_rcvinternal.c b/sched/mqueue/mq_rcvinternal.c
index b97e0aa918d..8ddac55429c 100644
--- a/sched/mqueue/mq_rcvinternal.c
+++ b/sched/mqueue/mq_rcvinternal.c
@@ -253,10 +253,7 @@ void nxmq_notify_receive(FAR struct mqueue_inode_s *msgq)
 
       DEBUGASSERT(btcb != NULL);
 
-      if (WDOG_ISACTIVE(&btcb->waitdog))
-        {
-          wd_cancel(&btcb->waitdog);
-        }
+      wd_cancel(&btcb->waitdog);
 
       msgq->cmn.nwaitnotfull--;
 
diff --git a/sched/mqueue/mq_sndinternal.c b/sched/mqueue/mq_sndinternal.c
index 2dcb24beaf2..0f36d4b04a9 100644
--- a/sched/mqueue/mq_sndinternal.c
+++ b/sched/mqueue/mq_sndinternal.c
@@ -286,10 +286,7 @@ void nxmq_notify_send(FAR struct mqueue_inode_s *msgq)
 
       DEBUGASSERT(btcb);
 
-      if (WDOG_ISACTIVE(&btcb->waitdog))
-        {
-          wd_cancel(&btcb->waitdog);
-        }
+      wd_cancel(&btcb->waitdog);
 
       msgq->cmn.nwaitnotempty--;
 
diff --git a/sched/mqueue/msgrcv.c b/sched/mqueue/msgrcv.c
index 9085ee43feb..6823169510a 100644
--- a/sched/mqueue/msgrcv.c
+++ b/sched/mqueue/msgrcv.c
@@ -252,10 +252,7 @@ ssize_t msgrcv(int msqid, FAR void *msgp, size_t msgsz, long msgtyp,
 
       DEBUGASSERT(btcb != NULL);
 
-      if (WDOG_ISACTIVE(&btcb->waitdog))
-        {
-          wd_cancel(&btcb->waitdog);
-        }
+      wd_cancel(&btcb->waitdog);
 
       msgq->cmn.nwaitnotfull--;
 
diff --git a/sched/mqueue/msgsnd.c b/sched/mqueue/msgsnd.c
index 9bbafeefe33..4384af24b19 100644
--- a/sched/mqueue/msgsnd.c
+++ b/sched/mqueue/msgsnd.c
@@ -245,10 +245,7 @@ int msgsnd(int msqid, FAR const void *msgp, size_t msgsz, int msgflg)
 
           DEBUGASSERT(btcb);
 
-          if (WDOG_ISACTIVE(&btcb->waitdog))
-            {
-              wd_cancel(&btcb->waitdog);
-            }
+          wd_cancel(&btcb->waitdog);
 
           msgq->cmn.nwaitnotempty--;
 
diff --git a/sched/semaphore/sem_post.c b/sched/semaphore/sem_post.c
index 6f507ce222d..875dfa8f8f7 100644
--- a/sched/semaphore/sem_post.c
+++ b/sched/semaphore/sem_post.c
@@ -209,10 +209,7 @@ int nxsem_post_slow(FAR sem_t *sem)
 
           /* Stop the watchdog timer */
 
-          if (WDOG_ISACTIVE(&stcb->waitdog))
-            {
-              wd_cancel(&stcb->waitdog);
-            }
+          wd_cancel(&stcb->waitdog);
 
           /* Indicate that the wait is over. */
 
diff --git a/sched/signal/sig_dispatch.c b/sched/signal/sig_dispatch.c
index 14e0d45ac3f..63ac05932bc 100644
--- a/sched/signal/sig_dispatch.c
+++ b/sched/signal/sig_dispatch.c
@@ -544,11 +544,7 @@ int nxsig_tcbdispatch(FAR struct tcb_s *stcb, siginfo_t *info,
             }
 
           sigemptyset(&stcb->sigwaitmask);
-
-          if (WDOG_ISACTIVE(&stcb->waitdog))
-            {
-              wd_cancel(&stcb->waitdog);
-            }
+          wd_cancel(&stcb->waitdog);
 
           /* Remove the task from waiting list */
 
@@ -606,11 +602,7 @@ int nxsig_tcbdispatch(FAR struct tcb_s *stcb, siginfo_t *info,
             }
 
           sigemptyset(&stcb->sigwaitmask);
-
-          if (WDOG_ISACTIVE(&stcb->waitdog))
-            {
-              wd_cancel(&stcb->waitdog);
-            }
+          wd_cancel(&stcb->waitdog);
 
           /* Remove the task from waiting list */