diff --git a/components/freertos/tasks.c b/components/freertos/tasks.c
index a324c2a21c..eaff6d96ea 100644
--- a/components/freertos/tasks.c
+++ b/components/freertos/tasks.c
@@ -1046,6 +1046,11 @@ static void prvAddNewTaskToReadyList( TCB_t *pxNewTCB, TaskFunction_t pxTaskCode
 {
 	TCB_t *curTCB, *tcb0, *tcb1;
 
+	/* Assure that xCoreID is valid or we'll have an out-of-bounds on pxCurrentTCB 
+	   You will assert here if e.g. you only have one CPU enabled in menuconfig and 
+	   are trying to start a task on core 1. */
+	configASSERT( xCoreID == tskNO_AFFINITY || xCoreID < portNUM_PROCESSORS);
+
     /* Ensure interrupts don't access the task lists while the lists are being
 	updated. */
 	taskENTER_CRITICAL(&xTaskQueueMutex);