diff --git a/lib/quirc b/lib/quirc
index 7f4001e719..8c6ffa228a 160000
--- a/lib/quirc
+++ b/lib/quirc
@@ -1 +1 @@
-Subproject commit 7f4001e71921e9e17405119e369775f5b4289a8b
+Subproject commit 8c6ffa228a4c7643daed7039d3c51d38a43991b8
diff --git a/ports/esp32s2/esp-idf-config/sdkconfig.defaults b/ports/esp32s2/esp-idf-config/sdkconfig.defaults
index 35e0846a7f..cc59e2a7ed 100644
--- a/ports/esp32s2/esp-idf-config/sdkconfig.defaults
+++ b/ports/esp32s2/esp-idf-config/sdkconfig.defaults
@@ -275,7 +275,7 @@ CONFIG_ESP32S2_ALLOW_RTC_FAST_MEM_AS_HEAP=y
 CONFIG_ESP_ERR_TO_NAME_LOOKUP=y
 CONFIG_ESP_SYSTEM_EVENT_QUEUE_SIZE=32
 CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=2304
-CONFIG_ESP_MAIN_TASK_STACK_SIZE=16384
+CONFIG_ESP_MAIN_TASK_STACK_SIZE=8192
 CONFIG_ESP_IPC_TASK_STACK_SIZE=1024
 CONFIG_ESP_MINIMAL_SHARED_STACK_SIZE=2048
 CONFIG_ESP_CONSOLE_UART_DEFAULT=y
@@ -806,7 +806,7 @@ CONFIG_ESP32_APPTRACE_LOCK_ENABLE=y
 CONFIG_ADC2_DISABLE_DAC=y
 CONFIG_SYSTEM_EVENT_QUEUE_SIZE=32
 CONFIG_SYSTEM_EVENT_TASK_STACK_SIZE=2304
-CONFIG_MAIN_TASK_STACK_SIZE=16384
+CONFIG_MAIN_TASK_STACK_SIZE=8192
 CONFIG_IPC_TASK_STACK_SIZE=1024
 CONFIG_CONSOLE_UART_DEFAULT=y
 # CONFIG_CONSOLE_UART_CUSTOM is not set
diff --git a/shared-module/qrio/quirc_alloc.h b/shared-module/qrio/quirc_alloc.h
index a015aee7f9..b01fac5bfb 100644
--- a/shared-module/qrio/quirc_alloc.h
+++ b/shared-module/qrio/quirc_alloc.h
@@ -10,3 +10,5 @@
 #define QUIRC_MALLOC(x) gc_alloc((x), 0, false)
 #define QUIRC_CALLOC(x,y) gc_alloc((x) * (y), 0, false)
 #define QUIRC_FREE(x) gc_free((x))
+
+#define QUIRC_SMALL_STACK (1)