diff --git a/components/freertos/Kconfig b/components/freertos/Kconfig
index 58fd559e97..e15770e081 100644
--- a/components/freertos/Kconfig
+++ b/components/freertos/Kconfig
@@ -474,7 +474,8 @@ menu "FreeRTOS"
         # Intended to be used as a constant from other Kconfig files.
         # Value is (32-bit) INT_MAX.
         hex
-        default 0x7FFFFFFF
+        default 0x7FFFFFFF if !FREERTOS_SMP
+        default 0xFFFFFFFF if FREERTOS_SMP
 
     config FREERTOS_SUPPORT_STATIC_ALLOCATION
         # Always enabled. Kconfig option preserved for compatibility with code which checked for
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 1703e3c5c9..c094fca5af 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
@@ -246,6 +246,7 @@ const DRAM_ATTR uint8_t FreeRTOS_openocd_params[ESP_FREERTOS_DEBUG_TABLE_END]  =
  * ------------------------------------------------------------------------------------------------------------------ */
 
 #if CONFIG_FREERTOS_SMP
+_Static_assert(tskNO_AFFINITY == CONFIG_FREERTOS_NO_AFFINITY, "CONFIG_FREERTOS_NO_AFFINITY must be the same as tskNO_AFFINITY");
 
 BaseType_t xTaskCreatePinnedToCore( TaskFunction_t pxTaskCode,
                                     const char * const pcName,