diff --git a/sched/sched/sched.h b/sched/sched/sched.h
index 6f1e7586051..f98c8e550f7 100644
--- a/sched/sched/sched.h
+++ b/sched/sched/sched.h
@@ -325,7 +325,7 @@ int nxthread_create(FAR const char *name, uint8_t ttype, int priority,
 /* Task list manipulation functions */
 
 bool nxsched_add_readytorun(FAR struct tcb_s *rtrtcb);
-bool nxsched_remove_readytorun(FAR struct tcb_s *rtrtcb, bool merge);
+bool nxsched_remove_readytorun(FAR struct tcb_s *rtrtcb);
 void nxsched_remove_self(FAR struct tcb_s *rtrtcb);
 bool nxsched_add_prioritized(FAR struct tcb_s *tcb, DSEG dq_queue_t *list);
 void nxsched_merge_prioritized(FAR dq_queue_t *list1, FAR dq_queue_t *list2,
diff --git a/sched/sched/sched_removereadytorun.c b/sched/sched/sched_removereadytorun.c
index e54c69d7b93..180592a2e8b 100644
--- a/sched/sched/sched_removereadytorun.c
+++ b/sched/sched/sched_removereadytorun.c
@@ -47,7 +47,6 @@
  *
  * Input Parameters:
  *   rtcb - Points to the TCB that is ready-to-run
- *   merge - Merge pending list or not
  *
  * Returned Value:
  *   true if the currently active task (the head of the ready-to-run list)
@@ -63,7 +62,7 @@
  ****************************************************************************/
 
 #ifndef CONFIG_SMP
-bool nxsched_remove_readytorun(FAR struct tcb_s *rtcb, bool merge)
+bool nxsched_remove_readytorun(FAR struct tcb_s *rtcb)
 {
   FAR dq_queue_t *tasklist;
   bool doswitch = false;
@@ -99,17 +98,12 @@ bool nxsched_remove_readytorun(FAR struct tcb_s *rtcb, bool merge)
 
   rtcb->task_state = TSTATE_TASK_INVALID;
 
-  if (list_pendingtasks()->head && merge)
-    {
-      doswitch |= nxsched_merge_pending();
-    }
-
   return doswitch;
 }
 
 void nxsched_remove_self(FAR struct tcb_s *tcb)
 {
-  nxsched_remove_readytorun(tcb, true);
+  nxsched_remove_readytorun(tcb);
 }
 #endif /* !CONFIG_SMP */
 
@@ -121,7 +115,6 @@ void nxsched_remove_self(FAR struct tcb_s *tcb)
  *
  * Input Parameters:
  *   rtcb - Points to the TCB that is ready-to-run
- *   merge - Merge pending list or not
  *
  * Returned Value:
  *   true if the currently active task (the head of the ready-to-run list)
@@ -284,10 +277,8 @@ void nxsched_remove_self(FAR struct tcb_s *tcb)
     }
 }
 
-bool nxsched_remove_readytorun(FAR struct tcb_s *tcb, bool merge)
+bool nxsched_remove_readytorun(FAR struct tcb_s *tcb)
 {
-  bool doswitch = false;
-
   if (tcb->task_state == TSTATE_TASK_RUNNING)
     {
       DEBUGASSERT(tcb->cpu == this_cpu());
@@ -307,7 +298,7 @@ bool nxsched_remove_readytorun(FAR struct tcb_s *tcb, bool merge)
             {
               g_delivertasks[i] = NULL;
               tcb->task_state = TSTATE_TASK_INVALID;
-              goto finish;
+              return false;
             }
         }
 
@@ -327,12 +318,6 @@ bool nxsched_remove_readytorun(FAR struct tcb_s *tcb, bool merge)
       tcb->task_state = TSTATE_TASK_INVALID;
     }
 
-finish:
-  if (list_pendingtasks()->head && merge)
-    {
-      doswitch |= nxsched_merge_pending();
-    }
-
-  return doswitch;
+  return false;
 }
 #endif /* CONFIG_SMP */
diff --git a/sched/sched/sched_reprioritizertr.c b/sched/sched/sched_reprioritizertr.c
index ff6acb1ab7b..f242a563656 100644
--- a/sched/sched/sched_reprioritizertr.c
+++ b/sched/sched/sched_reprioritizertr.c
@@ -64,7 +64,7 @@ bool nxsched_reprioritize_rtr(FAR struct tcb_s *tcb, int priority)
    * remove the head of the ready to run list.
    */
 
-  switch_needed = nxsched_remove_readytorun(tcb, false);
+  switch_needed = nxsched_remove_readytorun(tcb);
 
   /* Setup up the new task priority */
 
diff --git a/sched/sched/sched_setpriority.c b/sched/sched/sched_setpriority.c
index fe788c82709..2eabdd1be20 100644
--- a/sched/sched/sched_setpriority.c
+++ b/sched/sched/sched_setpriority.c
@@ -200,7 +200,7 @@ static inline void nxsched_running_setpriority(FAR struct tcb_s *tcb,
 
           do
             {
-              bool check = nxsched_remove_readytorun(nxttcb, false);
+              bool check = nxsched_remove_readytorun(nxttcb);
               DEBUGASSERT(check == false);
               UNUSED(check);
 
diff --git a/sched/sched/sched_suspend.c b/sched/sched/sched_suspend.c
index dc6c3418f53..fbd0235f3d3 100644
--- a/sched/sched/sched_suspend.c
+++ b/sched/sched/sched_suspend.c
@@ -77,7 +77,7 @@ static int nxsched_suspend_handler(FAR void *cookie)
       tcb->flags = arg->saved_flags;
     }
 
-  nxsched_remove_readytorun(tcb, false);
+  nxsched_remove_readytorun(tcb);
 
   tcb->task_state = TSTATE_TASK_STOPPED;
   dq_addlast((FAR dq_entry_t *)tcb, &g_stoppedtasks);
@@ -172,7 +172,12 @@ void nxsched_suspend(FAR struct tcb_s *tcb)
       else
 #endif
         {
-          switch_needed = nxsched_remove_readytorun(tcb, true);
+          switch_needed = nxsched_remove_readytorun(tcb);
+
+          if (list_pendingtasks()->head)
+            {
+              switch_needed |= nxsched_merge_pending();
+            }
 
           /* Add the task to the specified blocked task list */
 
diff --git a/sched/task/task_restart.c b/sched/task/task_restart.c
index 65c08624a59..f95c9b0d293 100644
--- a/sched/task/task_restart.c
+++ b/sched/task/task_restart.c
@@ -83,7 +83,7 @@ static int restart_handler(FAR void *cookie)
       tcb->flags = arg->saved_flags;
     }
 
-  nxsched_remove_readytorun(tcb, false);
+  nxsched_remove_readytorun(tcb);
 
   leave_critical_section(flags);
 
@@ -117,7 +117,7 @@ static void nxtask_reset_task(FAR struct tcb_s *tcb, bool remove)
 
   if (remove)
     {
-      nxsched_remove_readytorun(tcb, false);
+      nxsched_remove_readytorun(tcb);
     }
 
   /* Deallocate anything left in the TCB's signal queues */
diff --git a/sched/task/task_terminate.c b/sched/task/task_terminate.c
index 71242d47aee..8eee41b1999 100644
--- a/sched/task/task_terminate.c
+++ b/sched/task/task_terminate.c
@@ -66,7 +66,7 @@ static int terminat_handler(FAR void *cookie)
       return -ESRCH;
     }
 
-  nxsched_remove_readytorun(tcb, false);
+  nxsched_remove_readytorun(tcb);
 
   leave_critical_section(flags);
   return OK;
@@ -164,7 +164,7 @@ int nxtask_terminate(pid_t pid)
   else
 #endif
     {
-      nxsched_remove_readytorun(dtcb, false);
+      nxsched_remove_readytorun(dtcb);
     }
 
   dtcb->task_state = task_state;