diff --git a/examples/device/cdc_msc_freertos/sdkconfig.defaults b/examples/device/cdc_msc_freertos/sdkconfig.defaults
index 23de48ebd..3253f605c 100644
--- a/examples/device/cdc_msc_freertos/sdkconfig.defaults
+++ b/examples/device/cdc_msc_freertos/sdkconfig.defaults
@@ -2,3 +2,4 @@ CONFIG_IDF_CMAKE=y
 CONFIG_IDF_TARGET="esp32s2"
 CONFIG_IDF_TARGET_ESP32S2=y
 CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK=y
+CONFIG_FREERTOS_SUPPORT_STATIC_ALLOCATION=y
diff --git a/examples/device/hid_composite_freertos/sdkconfig.defaults b/examples/device/hid_composite_freertos/sdkconfig.defaults
index 23de48ebd..3253f605c 100644
--- a/examples/device/hid_composite_freertos/sdkconfig.defaults
+++ b/examples/device/hid_composite_freertos/sdkconfig.defaults
@@ -2,3 +2,4 @@ CONFIG_IDF_CMAKE=y
 CONFIG_IDF_TARGET="esp32s2"
 CONFIG_IDF_TARGET_ESP32S2=y
 CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK=y
+CONFIG_FREERTOS_SUPPORT_STATIC_ALLOCATION=y
diff --git a/hw/bsp/esp32s2_saola_1/esp32s2_saola_1.c b/hw/bsp/esp32s2_saola_1/esp32s2_saola_1.c
index 8515e10e2..ef70f1ee2 100644
--- a/hw/bsp/esp32s2_saola_1/esp32s2_saola_1.c
+++ b/hw/bsp/esp32s2_saola_1/esp32s2_saola_1.c
@@ -37,8 +37,8 @@
 
 // Note: On the production version (v1.2) WS2812 is connected to GPIO 18,
 // however earlier revision v1.1 WS2812 is connected to GPIO 17
-#define LED_PIN               18 // v1.2 and later
-//#define LED_PIN               17 // v1.1
+//#define LED_PIN               18 // v1.2 and later
+#define LED_PIN               17 // v1.1
 
 #define BUTTON_PIN            0
 #define BUTTON_STATE_ACTIVE   0