diff --git a/components/driver/Kconfig b/components/driver/Kconfig
index 87af588303..11c2f1baf4 100644
--- a/components/driver/Kconfig
+++ b/components/driver/Kconfig
@@ -401,6 +401,7 @@ menu "Driver Configurations"
         config I2S_ISR_IRAM_SAFE
             bool "I2S ISR IRAM-Safe"
             default n
+            select GDMA_ISR_IRAM_SAFE if SOC_GDMA_SUPPORTED
             help
                 Ensure the I2S interrupt is IRAM-Safe by allowing the interrupt handler to be
                 executable when the cache is disabled (e.g. SPI Flash write).
diff --git a/components/driver/i2s/i2s_common.c b/components/driver/i2s/i2s_common.c
index 4d7ccb7c17..e994b3e2fc 100644
--- a/components/driver/i2s/i2s_common.c
+++ b/components/driver/i2s/i2s_common.c
@@ -406,6 +406,7 @@ esp_err_t i2s_alloc_dma_desc(i2s_chan_handle_t handle, uint32_t num, uint32_t bu
     handle->dma.desc = (lldesc_t **)heap_caps_calloc(num, sizeof(lldesc_t *), I2S_MEM_ALLOC_CAPS);
     ESP_GOTO_ON_FALSE(handle->dma.desc, ESP_ERR_NO_MEM, err, TAG, "create I2S DMA decriptor array failed");
     handle->dma.bufs = (uint8_t **)heap_caps_calloc(num, sizeof(uint8_t *), I2S_MEM_ALLOC_CAPS);
+    ESP_GOTO_ON_FALSE(handle->dma.bufs, ESP_ERR_NO_MEM, err, TAG, "create I2S DMA buffer array failed");
     for (int i = 0; i < num; i++) {
         /* Allocate DMA descriptor */
         handle->dma.desc[i] = (lldesc_t *) heap_caps_calloc(1, sizeof(lldesc_t), I2S_DMA_ALLOC_CAPS);
diff --git a/components/driver/i2s/i2s_private.h b/components/driver/i2s/i2s_private.h
index 08db03abc1..ad0c27affe 100644
--- a/components/driver/i2s/i2s_private.h
+++ b/components/driver/i2s/i2s_private.h
@@ -25,7 +25,7 @@ extern "C" {
 
 // If ISR handler is allowed to run whilst cache is disabled,
 // Make sure all the code and related variables used by the handler are in the SRAM
-#if CONFIG_I2S_ISR_IRAM_SAFE
+#if CONFIG_I2S_ISR_IRAM_SAFE || CONFIG_GDMA_ISR_IRAM_SAFE
 #define I2S_INTR_ALLOC_FLAGS    (ESP_INTR_FLAG_IRAM | ESP_INTR_FLAG_INTRDISABLED | ESP_INTR_FLAG_SHARED | ESP_INTR_FLAG_LOWMED)
 #define I2S_MEM_ALLOC_CAPS      (MALLOC_CAP_INTERNAL | MALLOC_CAP_8BIT)
 #else