diff --git a/arch/arm/src/common/up_pthread_start.c b/arch/arm/src/common/up_pthread_start.c
index 4b325557a4f..f8988da9ebc 100644
--- a/arch/arm/src/common/up_pthread_start.c
+++ b/arch/arm/src/common/up_pthread_start.c
@@ -80,6 +80,8 @@ void up_pthread_start(pthread_startroutine_t entrypt, pthread_addr_t arg)
   /* Let sys_call2() do all of the work */
 
   sys_call2(SYS_pthread_start, (uintptr_t)entrypt, (uintptr_t)arg);
+
+  PANIC();
 }
 
 #endif /* (CONFIG_BUILD_PROTECTED || CONFIG_BUILD_KERNEL) && !CONFIG_DISABLE_PTHREAD */
diff --git a/arch/arm/src/common/up_task_start.c b/arch/arm/src/common/up_task_start.c
index 9c4e7fdf601..3662246fdf1 100644
--- a/arch/arm/src/common/up_task_start.c
+++ b/arch/arm/src/common/up_task_start.c
@@ -80,6 +80,8 @@ void up_task_start(main_t taskentry, int argc, FAR char *argv[])
 
   sys_call3(SYS_task_start, (uintptr_t)taskentry, (uintptr_t)argc,
             (uintptr_t)argv);
+
+  PANIC();
 }
 
 #endif /* CONFIG_BUILD_PROTECTED || CONFIG_BUILD_KERNEL */
diff --git a/arch/or1k/src/common/up_pthread_start.c b/arch/or1k/src/common/up_pthread_start.c
index 4ee25c443b9..15880ad7025 100644
--- a/arch/or1k/src/common/up_pthread_start.c
+++ b/arch/or1k/src/common/up_pthread_start.c
@@ -82,6 +82,8 @@ void up_pthread_start(pthread_startroutine_t entrypt, pthread_addr_t arg)
   sinfo("entry %p arg %p\n", entrypt, arg);
 
   sys_call2(SYS_pthread_start, (uintptr_t)entrypt, (uintptr_t)arg);
+
+  PANIC();
 }
 
 #endif /* (CONFIG_BUILD_PROTECTED || CONFIG_BUILD_KERNEL) && !CONFIG_DISABLE_PTHREAD */
diff --git a/arch/or1k/src/common/up_task_start.c b/arch/or1k/src/common/up_task_start.c
index f84c6b6f8a7..d44b9f97552 100644
--- a/arch/or1k/src/common/up_task_start.c
+++ b/arch/or1k/src/common/up_task_start.c
@@ -82,6 +82,8 @@ void up_task_start(main_t taskentry, int argc, FAR char *argv[])
 
   sys_call3(SYS_task_start, (uintptr_t)taskentry, (uintptr_t)argc,
             (uintptr_t)argv);
+
+  PANIC();
 }
 
 #endif /* CONFIG_BUILD_PROTECTED || CONFIG_BUILD_KERNEL */
diff --git a/arch/risc-v/src/common/up_pthread_start.c b/arch/risc-v/src/common/up_pthread_start.c
index 5b346c550c7..156a3c2ecba 100644
--- a/arch/risc-v/src/common/up_pthread_start.c
+++ b/arch/risc-v/src/common/up_pthread_start.c
@@ -65,6 +65,8 @@ void up_pthread_start(pthread_startroutine_t entrypt, pthread_addr_t arg)
   /* Let sys_call2() do all of the work */
 
   sys_call2(SYS_pthread_start, (uintptr_t)entrypt, (uintptr_t)arg);
+
+  PANIC();
 }
 
 #endif /* (CONFIG_BUILD_PROTECTED || CONFIG_BUILD_KERNEL) && !CONFIG_DISABLE_PTHREAD */
diff --git a/arch/risc-v/src/common/up_task_start.c b/arch/risc-v/src/common/up_task_start.c
index 52920b24467..48ff179d095 100644
--- a/arch/risc-v/src/common/up_task_start.c
+++ b/arch/risc-v/src/common/up_task_start.c
@@ -65,6 +65,8 @@ void up_task_start(main_t taskentry, int argc, FAR char *argv[])
 
   sys_call3(SYS_task_start, (uintptr_t)taskentry, (uintptr_t)argc,
             (uintptr_t)argv);
+
+  PANIC();
 }
 
 #endif /* CONFIG_BUILD_PROTECTED || CONFIG_BUILD_KERNEL */