diff --git a/sched/signal/sig_cleanup.c b/sched/signal/sig_cleanup.c
index 9c882b00e5e..5047f0ad07d 100644
--- a/sched/signal/sig_cleanup.c
+++ b/sched/signal/sig_cleanup.c
@@ -58,7 +58,7 @@
 
 void nxsig_cleanup(FAR struct tcb_s *stcb)
 {
-  FAR sigq_t     *sigq;
+  FAR sigq_t *sigq;
 
   /* Deallocate all entries in the list of pending signal actions */
 
@@ -110,4 +110,3 @@ void nxsig_release(FAR struct task_group_s *group)
       nxsig_release_pendingsignal(sigpend);
     }
 }
-
diff --git a/sched/task/task_restart.c b/sched/task/task_restart.c
index b17dfbb8f64..c799d5e1d64 100644
--- a/sched/task/task_restart.c
+++ b/sched/task/task_restart.c
@@ -158,10 +158,12 @@ int task_restart(pid_t pid)
   dq_rem((FAR dq_entry_t *)tcb, tasklist);
   tcb->cmn.task_state = TSTATE_TASK_INVALID;
 
+#ifndef CONFIG_DISABLE_SIGNALS
   /* Deallocate anything left in the TCB's signal queues */
 
   nxsig_cleanup((FAR struct tcb_s *)tcb);  /* Deallocate Signal lists */
   tcb->cmn.sigprocmask = NULL_SIGNAL_SET;  /* Reset sigprocmask */
+#endif
 
   /* Reset the current task priority  */