diff --git a/components/spi_flash/flash_mmap.c b/components/spi_flash/flash_mmap.c
index 534a7e3d3..b3ccf301e 100644
--- a/components/spi_flash/flash_mmap.c
+++ b/components/spi_flash/flash_mmap.c
@@ -157,6 +157,7 @@ esp_err_t IRAM_ATTR spi_flash_mmap_pages(const int *pages, size_t page_count, sp
     uint32_t region_addr;  // base address of memory region
     get_mmu_region(memory,&region_begin,&region_size,&region_addr);
     if (region_size < page_count) {
+        spi_flash_enable_interrupts_caches_and_other_cpu();
         return ESP_ERR_NO_MEM;
     }
     // The following part searches for a range of MMU entries which can be used.
diff --git a/components/spi_flash/test/test_mmap.c b/components/spi_flash/test/test_mmap.c
index 4cdb77594..8d17fa3ac 100644
--- a/components/spi_flash/test/test_mmap.c
+++ b/components/spi_flash/test/test_mmap.c
@@ -299,9 +299,8 @@ TEST_CASE("flash_mmap can mmap after get enough free MMU pages", "[spi_flash]")
         }
     }
     uint32_t free_pages = spi_flash_mmap_get_free_pages(SPI_FLASH_MMAP_DATA);
-    if (spi_flash_get_chip_size() <= 0x200000) {
-        free_pages -= 0x200000/0x10000;
-    }
+    uint32_t flash_pages = spi_flash_get_chip_size() / SPI_FLASH_MMU_PAGE_SIZE;
+    free_pages = (free_pages > flash_pages) ? flash_pages : free_pages;
 
     printf("Mapping %x (+%x)\n", 0, free_pages * SPI_FLASH_MMU_PAGE_SIZE);
     const void *ptr2;