diff --git a/tasks.c b/tasks.c
index e2861dd94aa..ed3cd1ee2ed 100644
--- a/tasks.c
+++ b/tasks.c
@@ -3843,6 +3843,18 @@ static void prvCheckTasksWaitingTermination( void )
                     }
                 }
                 #endif /* INCLUDE_vTaskSuspend */
+
+                /* Tasks can be in pending ready list and other state list at the
+                 * same time. These tasks are in ready state no matter what state
+                 * list the task is in. */
+                taskENTER_CRITICAL();
+                {
+                    if( listIS_CONTAINED_WITHIN( &xPendingReadyList, &( pxTCB->xEventListItem ) ) != pdFALSE )
+                    {
+                        pxTaskStatus->eCurrentState = eReady;
+                    }
+                }
+                taskEXIT_CRITICAL();
             }
         }
         else