diff --git a/bootloader/l4t/l4t.c b/bootloader/l4t/l4t.c
index f121a79c..2327b7d5 100644
--- a/bootloader/l4t/l4t.c
+++ b/bootloader/l4t/l4t.c
@@ -1018,6 +1018,8 @@ void launch_l4t(const ini_sec_t *ini_sec, int entry_idx, int is_list, bool t210b
 
 	// Done loading bootloaders/firmware.
 	boot_storage_end();
+	sd_end();
+	emmc_end();
 
 	// We don't need AHB aperture open.
 	mc_disable_ahb_redirect();
diff --git a/bootloader/main.c b/bootloader/main.c
index 32b5f681..939058a7 100644
--- a/bootloader/main.c
+++ b/bootloader/main.c
@@ -209,6 +209,8 @@ static void _launch_payload(char *path, bool update, bool clear_screen)
 		goto out;
 
 	boot_storage_end();
+	sd_end();
+	emmc_end();
 
 	if (size < 0x30000)
 	{