diff --git a/components/freertos/esp_additions/include/freertos/task_snapshot.h b/components/freertos/esp_additions/include/freertos/task_snapshot.h
index bd8fe82a1b..07849a8cd1 100644
--- a/components/freertos/esp_additions/include/freertos/task_snapshot.h
+++ b/components/freertos/esp_additions/include/freertos/task_snapshot.h
@@ -54,8 +54,9 @@ TaskHandle_t pxTaskGetNext( TaskHandle_t pxTask );
  * 		 does not acquire any locks.
  * @param[in] pxTask Task's handle
  * @param[out] pxTaskSnapshot Snapshot of the task
+ * @return pdTRUE if operation was successful else pdFALSE
  */
-void vTaskGetSnapshot( TaskHandle_t pxTask, TaskSnapshot_t *pxTaskSnapshot );
+BaseType_t vTaskGetSnapshot( TaskHandle_t pxTask, TaskSnapshot_t *pxTaskSnapshot );
 
 /**
  * @brief Fill an array of TaskSnapshot_t structures for every task in the system
diff --git a/components/freertos/esp_additions/private_include/freertos_tasks_c_additions.h b/components/freertos/esp_additions/private_include/freertos_tasks_c_additions.h
index faa0415813..1703e3c5c9 100644
--- a/components/freertos/esp_additions/private_include/freertos_tasks_c_additions.h
+++ b/components/freertos/esp_additions/private_include/freertos_tasks_c_additions.h
@@ -162,14 +162,17 @@ TaskHandle_t pxTaskGetNext( TaskHandle_t pxTask )
     return pxNextTCB;
 }
 
-void vTaskGetSnapshot( TaskHandle_t pxTask, TaskSnapshot_t *pxTaskSnapshot )
+BaseType_t vTaskGetSnapshot( TaskHandle_t pxTask, TaskSnapshot_t *pxTaskSnapshot )
 {
-    configASSERT( portVALID_TCB_MEM(pxTask) );
-    configASSERT( pxTaskSnapshot != NULL );
+    if (portVALID_TCB_MEM(pxTask) == false || pxTaskSnapshot == NULL) {
+        return pdFALSE;
+    }
+
     TCB_t *pxTCB = (TCB_t *)pxTask;
     pxTaskSnapshot->pxTCB = pxTCB;
     pxTaskSnapshot->pxTopOfStack = (StackType_t *)pxTCB->pxTopOfStack;
     pxTaskSnapshot->pxEndOfStack = (StackType_t *)pxTCB->pxEndOfStack;
+    return pdTRUE;
 }
 
 UBaseType_t uxTaskGetSnapshotAll( TaskSnapshot_t * const pxTaskSnapshotArray, const UBaseType_t uxArrayLength, UBaseType_t * const pxTCBSize )