diff --git a/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32h21.c b/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32h21.c
index 6dee7d4876..b7f3e9b833 100644
--- a/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32h21.c
+++ b/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32h21.c
@@ -125,16 +125,10 @@ static void print_flash_info(const esp_image_header_t *bootloader_hdr)
     const char *str;
     switch (bootloader_hdr->spi_speed) {
     case ESP_IMAGE_SPI_SPEED_DIV_2:
-        str = "32MHz";
-        break;
-    case ESP_IMAGE_SPI_SPEED_DIV_3:
-        str = "21.3MHz";
-        break;
-    case ESP_IMAGE_SPI_SPEED_DIV_4:
-        str = "16MHz";
+        str = "24MHz";
         break;
     case ESP_IMAGE_SPI_SPEED_DIV_1:
-        str = "64MHz";
+        str = "48MHz";
         break;
     default:
         str = "16MHz";
diff --git a/components/spi_flash/esp32h21/Kconfig.flash_freq b/components/spi_flash/esp32h21/Kconfig.flash_freq
index f173f3fd88..a24b915877 100644
--- a/components/spi_flash/esp32h21/Kconfig.flash_freq
+++ b/components/spi_flash/esp32h21/Kconfig.flash_freq
@@ -1,10 +1,8 @@
 choice ESPTOOLPY_FLASHFREQ
     prompt "Flash SPI speed"
-    default ESPTOOLPY_FLASHFREQ_32M
-    config ESPTOOLPY_FLASHFREQ_64M
-        bool "64 MHz"
-    config ESPTOOLPY_FLASHFREQ_32M
-        bool "32 MHz"
-    config ESPTOOLPY_FLASHFREQ_16M
-        bool "16 MHz"
+    default ESPTOOLPY_FLASHFREQ_48M
+    config ESPTOOLPY_FLASHFREQ_48M
+        bool "48 MHz"
+    config ESPTOOLPY_FLASHFREQ_24M
+        bool "24 MHz"
 endchoice
diff --git a/components/spi_flash/test_apps/esp_flash/main/test_esp_flash_drv.c b/components/spi_flash/test_apps/esp_flash/main/test_esp_flash_drv.c
index d887ab89fe..bf46dac925 100644
--- a/components/spi_flash/test_apps/esp_flash/main/test_esp_flash_drv.c
+++ b/components/spi_flash/test_apps/esp_flash/main/test_esp_flash_drv.c
@@ -598,6 +598,8 @@ TEST_CASE_MULTI_FLASH_IGNORE("Test esp_flash_write can toggle QE bit", test_togg
 // This table could be chip specific in the future.
 #if CONFIG_IDF_TARGET_ESP32C2
 uint8_t flash_frequency_table[5] = {5, 10, 20, 40};
+#elif CONFIG_IDF_TARGET_ESP32H21
+uint8_t flash_frequency_table[4] = {6, 12, 24, 48};
 #else
 uint8_t flash_frequency_table[6] = {5, 10, 20, 26, 40, 80};
 #endif