diff --git a/components/freertos/tasks.c b/components/freertos/tasks.c
index 95180b79ae..dd0487958c 100644
--- a/components/freertos/tasks.c
+++ b/components/freertos/tasks.c
@@ -917,6 +917,13 @@ UBaseType_t x;
 	}
 	#endif /* tskSET_NEW_STACKS_TO_KNOWN_VALUE */
 
+	#if( configUSE_TRACE_FACILITY == 1 )
+	{
+		/* Zero the uxTaskNumber TCB member to avoid random value from dynamically allocated TCBs */
+		pxNewTCB->uxTaskNumber = 0;
+	}
+	#endif  /* ( configUSE_TRACE_FACILITY == 1 ) */
+
 	/* Calculate the top of stack address.  This depends on whether the stack
 	grows from high memory to low (as per the 80x86) or vice versa.
 	portSTACK_GROWTH is used to make the result positive or negative as required