diff --git a/sched/signal/sig_dispatch.c b/sched/signal/sig_dispatch.c
index ce2842d513..9b926667a6 100644
--- a/sched/signal/sig_dispatch.c
+++ b/sched/signal/sig_dispatch.c
@@ -372,9 +372,14 @@ int nxsig_tcbdispatch(FAR struct tcb_s *stcb, siginfo_t *info)
   if (masked == 1)
 #endif
     {
-      /* Add signal to pending queue regardless. */
+#ifdef CONFIG_LIB_SYSCALL
+      /* If the thread is in syscall, schedule the sigaction here */
 
-      nxsig_add_pendingsignal(stcb, info);
+      if ((stcb->flags & TCB_FLAG_SYSCALL) != 0)
+        {
+          nxsig_add_pendingsignal(stcb, info);
+        }
+#endif
 
       /* Check if the task is waiting for this pending signal. If so, then
        * unblock it. This must be performed in a critical section because
@@ -406,9 +411,19 @@ int nxsig_tcbdispatch(FAR struct tcb_s *stcb, siginfo_t *info)
             {
               up_switch_context(stcb, rtcb);
             }
+
+          leave_critical_section(flags);
         }
 
-      leave_critical_section(flags);
+      /* Its not one we are waiting for... Add it to the list of pending
+       * signals.
+       */
+
+      else
+        {
+          leave_critical_section(flags);
+          nxsig_add_pendingsignal(stcb, info);
+        }
     }
 
   /************************* UNMASKED SIGNAL ACTIONS ************************/