diff --git a/src/arch/x86_64/kernel/scheduler.rs b/src/arch/x86_64/kernel/scheduler.rs
index 1a31956dd0..7ed51c8e92 100644
--- a/src/arch/x86_64/kernel/scheduler.rs
+++ b/src/arch/x86_64/kernel/scheduler.rs
@@ -13,7 +13,6 @@ use crate::arch::x86_64::mm::paging::{
 	BasePageSize, PageSize, PageTableEntryFlags, PageTableEntryFlagsExt,
 };
 use crate::config::*;
-use crate::env;
 use crate::mm::{FrameAlloc, PageAlloc, PageRangeAllocator};
 use crate::scheduler::task::{Task, TaskFrame};
 use crate::scheduler::{PerCoreSchedulerExt, timer_interrupts};
@@ -220,12 +219,10 @@ impl Drop for TaskStacks {
 					stacks.total_size >> 10,
 				);
 
-				if !env::is_uefi() {
-					crate::arch::mm::paging::unmap::<BasePageSize>(
-						stacks.virt_addr,
-						stacks.total_size / BasePageSize::SIZE as usize + 4,
-					);
-				}
+				crate::arch::mm::paging::unmap::<BasePageSize>(
+					stacks.virt_addr,
+					stacks.total_size / BasePageSize::SIZE as usize + 4,
+				);
 				let range = PageRange::from_start_len(
 					stacks.virt_addr.as_usize(),
 					stacks.total_size + 4 * BasePageSize::SIZE as usize,