diff --git a/src/arch/aarch64/mm/paging.rs b/src/arch/aarch64/mm/paging.rs
index 61316a906a..92161ddeff 100644
--- a/src/arch/aarch64/mm/paging.rs
+++ b/src/arch/aarch64/mm/paging.rs
@@ -413,8 +413,8 @@ impl<L: PageTableLevel> PageTableMethods for PageTable<L> {
 		}
 
 		if flags == PageTableEntryFlags::BLANK {
-			// in this case we unmap the pages
-			self.entries[index].set(physical_address, flags);
+			// We already unmapped the page
+			return;
 		} else {
 			self.entries[index].set(physical_address, S::MAP_EXTRA_FLAG | flags);
 		}
diff --git a/src/arch/riscv64/mm/paging.rs b/src/arch/riscv64/mm/paging.rs
index 167f1099da..6ed8f99097 100644
--- a/src/arch/riscv64/mm/paging.rs
+++ b/src/arch/riscv64/mm/paging.rs
@@ -135,6 +135,11 @@ impl PageTableEntry {
 		(self.physical_address_and_flags & PageTableEntryFlags::EXECUTABLE.bits()) != 0
 	}
 
+	/// Mark this as an invalid (not present) entry
+	fn unset(&mut self) {
+		self.physical_address_and_flags = PhysAddr::zero();
+	}
+
 	/// Mark this as a valid (present) entry and set address translation and flags.
 	///
 	/// # Arguments
@@ -377,10 +382,15 @@ impl<L: PageTableLevel> PageTableMethods for PageTable<L> {
 		let index = page.table_index::<L>();
 		let flush = self.entries[index].is_present();
 
-		self.entries[index].set(
-			physical_address,
-			S::MAP_EXTRA_FLAG | PageTableEntryFlags::ACCESSED | PageTableEntryFlags::DIRTY | flags,
-		);
+		if physical_address.is_null() && flags == PageTableEntryFlags::BLANK {
+			// Clear PTE
+			self.entries[index].unset();
+		} else {
+			self.entries[index].set(
+				physical_address,
+				S::MAP_EXTRA_FLAG | PageTableEntryFlags::ACCESSED | PageTableEntryFlags::DIRTY | flags,
+			);
+		}
 
 		if flush {
 			page.flush_from_tlb();