diff --git a/arch/arm/src/arm/up_assert.c b/arch/arm/src/arm/up_assert.c
index 059de0fa0c7..31dab564990 100644
--- a/arch/arm/src/arm/up_assert.c
+++ b/arch/arm/src/arm/up_assert.c
@@ -310,7 +310,7 @@ static void _up_assert(int errorcode)
 
   /* Are we in an interrupt handler or the idle task? */
 
-  if (CURRENT_REGS || running_task()->pid == 0)
+  if (CURRENT_REGS || running_task()->flink == NULL)
     {
       (void)up_irq_save();
       for (; ; )
diff --git a/arch/arm/src/armv6-m/up_assert.c b/arch/arm/src/armv6-m/up_assert.c
index 1f487b286a9..0f6b21e8be2 100644
--- a/arch/arm/src/armv6-m/up_assert.c
+++ b/arch/arm/src/armv6-m/up_assert.c
@@ -367,7 +367,7 @@ static void _up_assert(int errorcode)
 
   /* Are we in an interrupt handler or the idle task? */
 
-  if (CURRENT_REGS || running_task()->pid == 0)
+  if (CURRENT_REGS || running_task()->flink == NULL)
     {
       (void)up_irq_save();
       for (; ; )
diff --git a/arch/arm/src/armv7-a/arm_assert.c b/arch/arm/src/armv7-a/arm_assert.c
index 3d6781a26b8..05c247d6f75 100644
--- a/arch/arm/src/armv7-a/arm_assert.c
+++ b/arch/arm/src/armv7-a/arm_assert.c
@@ -395,7 +395,7 @@ static void _up_assert(int errorcode)
 
   /* Are we in an interrupt handler or the idle task? */
 
-  if (CURRENT_REGS || running_task()->pid == 0)
+  if (CURRENT_REGS || running_task()->flink == NULL)
     {
       /* Disable interrupts on this CPU */
 
diff --git a/arch/arm/src/armv7-m/up_assert.c b/arch/arm/src/armv7-m/up_assert.c
index 10ddd6a0c6c..bc4e55b4db9 100644
--- a/arch/arm/src/armv7-m/up_assert.c
+++ b/arch/arm/src/armv7-m/up_assert.c
@@ -389,7 +389,7 @@ static void _up_assert(int errorcode)
 
   /* Are we in an interrupt handler or the idle task? */
 
-  if (CURRENT_REGS || (running_task())->pid == 0)
+  if (CURRENT_REGS || (running_task())->flink == NULL)
     {
       (void)up_irq_save();
       for (; ; )
diff --git a/arch/arm/src/armv7-r/arm_assert.c b/arch/arm/src/armv7-r/arm_assert.c
index 2c7163aee22..59a1330fe78 100644
--- a/arch/arm/src/armv7-r/arm_assert.c
+++ b/arch/arm/src/armv7-r/arm_assert.c
@@ -374,7 +374,7 @@ static void _up_assert(int errorcode)
 
   /* Are we in an interrupt handler or the idle task? */
 
-  if (CURRENT_REGS || (running_task())->pid == 0)
+  if (CURRENT_REGS || (running_task())->flink == NULL)
     {
       (void)up_irq_save();
       for (; ; )
diff --git a/arch/avr/src/common/up_assert.c b/arch/avr/src/common/up_assert.c
index cd67e8483de..785656ace94 100644
--- a/arch/avr/src/common/up_assert.c
+++ b/arch/avr/src/common/up_assert.c
@@ -87,7 +87,7 @@ static void _up_assert(int errorcode)
 
   /* Are we in an interrupt handler or the idle task? */
 
-  if (g_current_regs || running_task()->pid == 0)
+  if (g_current_regs || running_task()->flink == NULL)
     {
       (void)up_irq_save();
       for (; ; )
diff --git a/arch/hc/src/m9s12/m9s12_assert.c b/arch/hc/src/m9s12/m9s12_assert.c
index 8496741a70e..d86d860408c 100644
--- a/arch/hc/src/m9s12/m9s12_assert.c
+++ b/arch/hc/src/m9s12/m9s12_assert.c
@@ -294,7 +294,7 @@ static void _up_assert(int errorcode)
 
   /* Are we in an interrupt handler or the idle task? */
 
-  if (g_current_regs || (running_task())->pid == 0)
+  if (g_current_regs || (running_task())->flink == NULL)
     {
        (void)up_irq_save();
         for (;;)
diff --git a/arch/mips/src/mips32/up_assert.c b/arch/mips/src/mips32/up_assert.c
index 356d6786319..d9b6e3c14aa 100644
--- a/arch/mips/src/mips32/up_assert.c
+++ b/arch/mips/src/mips32/up_assert.c
@@ -86,7 +86,7 @@ static void _up_assert(int errorcode)
 
   /* Are we in an interrupt handler or the idle task? */
 
-  if (g_current_regs || running_task()->pid == 0)
+  if (g_current_regs || running_task()->flink == NULL)
     {
        (void)up_irq_save();
         for (; ; )
diff --git a/arch/misoc/src/lm32/lm32_assert.c b/arch/misoc/src/lm32/lm32_assert.c
index b23a9f518fe..9569aae2898 100644
--- a/arch/misoc/src/lm32/lm32_assert.c
+++ b/arch/misoc/src/lm32/lm32_assert.c
@@ -87,7 +87,7 @@ static void _up_assert(int errorcode)
 
   /* Are we in an interrupt handler or the idle task? */
 
-  if (g_current_regs || running_task()->pid == 0)
+  if (g_current_regs || running_task()->flink == NULL)
     {
        (void)up_irq_save();
         for (; ; )
diff --git a/arch/or1k/src/common/up_assert.c b/arch/or1k/src/common/up_assert.c
index 9845d2ff8eb..74f1cb20ceb 100644
--- a/arch/or1k/src/common/up_assert.c
+++ b/arch/or1k/src/common/up_assert.c
@@ -372,7 +372,7 @@ static void _up_assert(int errorcode)
 
   /* Are we in an interrupt handler or the idle task? */
 
-  if (CURRENT_REGS || running_task()->pid == 0)
+  if (CURRENT_REGS || running_task()->flink == NULL)
     {
       (void)up_irq_save();
       for (; ; )
diff --git a/arch/renesas/src/common/up_assert.c b/arch/renesas/src/common/up_assert.c
index c5ff8c991da..b1cc8a2c4dc 100644
--- a/arch/renesas/src/common/up_assert.c
+++ b/arch/renesas/src/common/up_assert.c
@@ -88,7 +88,7 @@ static void _up_assert(int errorcode)
 
   /* Are we in an interrupt handler or the idle task? */
 
-  if (g_current_regs || running_task()->pid == 0)
+  if (g_current_regs || running_task()->flink == NULL)
     {
        (void)up_irq_save();
         for (;;)
diff --git a/arch/risc-v/src/rv32im/up_assert.c b/arch/risc-v/src/rv32im/up_assert.c
index 07d7dd55631..f13c0b2c519 100644
--- a/arch/risc-v/src/rv32im/up_assert.c
+++ b/arch/risc-v/src/rv32im/up_assert.c
@@ -87,7 +87,7 @@ static void _up_assert(int errorcode)
 
   /* Are we in an interrupt handler or the idle task? */
 
-  if (g_current_regs || running_task()->pid == 0)
+  if (g_current_regs || running_task()->flink == NULL)
     {
        (void)up_irq_save();
         for (; ; )
diff --git a/arch/x86/src/common/up_assert.c b/arch/x86/src/common/up_assert.c
index 1566b70586e..208ea9d7dfc 100644
--- a/arch/x86/src/common/up_assert.c
+++ b/arch/x86/src/common/up_assert.c
@@ -255,7 +255,7 @@ static void _up_assert(int errorcode)
 
   /* Are we in an interrupt handler or the idle task? */
 
-  if (g_current_regs || (running_task())->pid == 0)
+  if (g_current_regs || (running_task())->flink == NULL)
     {
        (void)up_irq_save();
         for (;;)
diff --git a/arch/xtensa/src/common/xtensa_assert.c b/arch/xtensa/src/common/xtensa_assert.c
index 850996bf362..10086212a8b 100644
--- a/arch/xtensa/src/common/xtensa_assert.c
+++ b/arch/xtensa/src/common/xtensa_assert.c
@@ -126,7 +126,7 @@ static void xtensa_assert(int errorcode)
 
   /* Are we in an interrupt handler or the idle task? */
 
-  if (CURRENT_REGS || running_task()->pid == 0)
+  if (CURRENT_REGS || running_task()->flink == NULL)
     {
        /* Blink the LEDs forever */
 
diff --git a/arch/z16/src/common/up_assert.c b/arch/z16/src/common/up_assert.c
index c26d04f1612..f22e9822860 100644
--- a/arch/z16/src/common/up_assert.c
+++ b/arch/z16/src/common/up_assert.c
@@ -87,7 +87,7 @@ static void _up_assert(int errorcode) /* noreturn_function */
 
   /* Are we in an interrupt handler or the idle task? */
 
-  if (up_interrupt_context() || running_task()->pid == 0)
+  if (up_interrupt_context() || running_task()->flink == NULL)
     {
        (void)up_irq_save();
         for (;;)
diff --git a/arch/z80/src/common/up_assert.c b/arch/z80/src/common/up_assert.c
index f770d4b9e43..9c7a9c758a7 100644
--- a/arch/z80/src/common/up_assert.c
+++ b/arch/z80/src/common/up_assert.c
@@ -86,7 +86,7 @@ static void _up_assert(int errorcode) /* noreturn_function */
 
   /* Are we in an interrupt handler or the idle task? */
 
-  if (up_interrupt_context() || running_task()->pid == 0)
+  if (up_interrupt_context() || running_task()->flink == NULL)
     {
        (void)up_irq_save();
         for (;;)