diff --git a/components/freertos/tasks.c b/components/freertos/tasks.c
index 210b6595a8..caa8838fd4 100644
--- a/components/freertos/tasks.c
+++ b/components/freertos/tasks.c
@@ -645,10 +645,11 @@ static void prvAddNewTaskToReadyList( TCB_t *pxNewTCB, TaskFunction_t pxTaskCode
 */
 void taskYIELD_OTHER_CORE( BaseType_t xCoreID, UBaseType_t uxPriority )
 {
-	TCB_t *curTCB = pxCurrentTCB[xCoreID];
+	TCB_t *curTCB;
 	BaseType_t i;
 
 	if (xCoreID != tskNO_AFFINITY) {
+		curTCB = pxCurrentTCB[xCoreID];
 		if ( curTCB->uxPriority < uxPriority ) {	// NOLINT(clang-analyzer-core.NullDereference) IDF-685
 			vPortYieldOtherCore( xCoreID );
 		}
diff --git a/tools/test_apps/system/startup/sdkconfig.ci.opt_o2 b/tools/test_apps/system/startup/sdkconfig.ci.opt_o2
new file mode 100644
index 0000000000..3c5a0fabea
--- /dev/null
+++ b/tools/test_apps/system/startup/sdkconfig.ci.opt_o2
@@ -0,0 +1 @@
+CONFIG_COMPILER_OPTIMIZATION_PERF=y