diff --git a/components/esp_ringbuf/linker.lf b/components/esp_ringbuf/linker.lf
index b23be0469d..0f69153343 100644
--- a/components/esp_ringbuf/linker.lf
+++ b/components/esp_ringbuf/linker.lf
@@ -2,3 +2,32 @@
 archive: libesp_ringbuf.a
 entries:
     * (noflash_text)
+    if FREERTOS_PLACE_FUNCTIONS_INTO_FLASH = y:
+        ringbuf: prvGetCurMaxSizeNoSplit (default)
+        ringbuf: prvGetCurMaxSizeAllowSplit (default)
+        ringbuf: prvGetCurMaxSizeByteBuf (default)
+        ringbuf: prvReturnItemByteBuf (default)
+        ringbuf: prvGetItemByteBuf (default)
+        ringbuf: prvCheckItemFitsByteBuffer (default)
+        ringbuf: prvReturnItemDefault (default)
+        ringbuf: prvGetItemDefault (default)
+        ringbuf: prvAcquireItemNoSplit (default)
+        ringbuf: prvSendItemDoneNoSplit (default)
+        ringbuf: prvCheckItemFitsDefault (default)
+        ringbuf: prvCopyItemByteBuf (default)
+        ringbuf: prvCopyItemAllowSplit (default)
+        ringbuf: prvCopyItemNoSplit (default)
+        ringbuf: prvInitializeNewRingbuffer (default)
+        ringbuf: prvReceiveGeneric (default)
+        ringbuf: xRingbufferCreate (default)
+        ringbuf: xRingbufferCreateStatic (default)
+        ringbuf: xRingbufferSend (default)
+        ringbuf: xRingbufferReceive (default)
+        ringbuf: xRingbufferReceiveSplit (default)
+        ringbuf: xRingbufferReceiveUpTo (default)
+        ringbuf: vRingbufferReturnItem (default)
+        ringbuf: vRingbufferDelete (default)
+        ringbuf: xRingbufferAddToQueueSetRead (default)
+        ringbuf: xRingbufferCanRead (default)
+        ringbuf: xRingbufferRemoveFromQueueSetRead (default)
+        ringbuf: vRingbufferGetInfo (default)
diff --git a/components/esp_ringbuf/test/test_ringbuf.c b/components/esp_ringbuf/test/test_ringbuf.c
index b54f342f84..77f4b5235a 100644
--- a/components/esp_ringbuf/test/test_ringbuf.c
+++ b/components/esp_ringbuf/test/test_ringbuf.c
@@ -678,8 +678,8 @@ static IRAM_ATTR __attribute__((noinline)) bool iram_ringbuf_test(void)
     result = result && (handle != NULL);
     spi_flash_guard_get()->start(); // Disables flash cache
     xRingbufferGetMaxItemSize(handle);
-    vRingbufferDelete(handle);
     spi_flash_guard_get()->end(); // Re-enables flash cache
+    vRingbufferDelete(handle);
 
     return result;
 }
diff --git a/components/freertos/linker.lf b/components/freertos/linker.lf
index b1653f27c8..ed2a429277 100644
--- a/components/freertos/linker.lf
+++ b/components/freertos/linker.lf
@@ -18,7 +18,6 @@ entries:
         tasks: prvInitialiseTaskLists (default)
         tasks: prvDeleteTCB (default)
         tasks: prvCheckTasksWaitingTermination (default)
-        tasks: prvAddCurrentTaskToDelayedList (default)
         tasks: prvIdleTask (default)
         tasks: prvAddNewTaskToReadyList (default)
         tasks: xTaskCreateStaticPinnedToCore (default)
@@ -84,7 +83,6 @@ entries:
         event_groups: xEventGroupSetBits (default)
         event_groups: xEventGroupSync (default)
         event_groups: vEventGroupDelete (default)
-        queue: prvIsQueueEmpty (default)
         queue: prvIsQueueFull (default)
         queue: prvInitialiseNewQueue (default)
         queue: prvInitialiseMutex (default)
diff --git a/tools/unit-test-app/configs/freertos_flash b/tools/unit-test-app/configs/freertos_flash
index f5698a5aaf..ddbca23830 100644
--- a/tools/unit-test-app/configs/freertos_flash
+++ b/tools/unit-test-app/configs/freertos_flash
@@ -1,2 +1,2 @@
-TEST_COMPONENTS=freertos driver spi_flash
+TEST_COMPONENTS=freertos driver spi_flash esp_ringbuf
 CONFIG_FREERTOS_TASK_FUNCTIONS_INTO_FLASH=y