diff --git a/src/system/kernel/vm/VMUserAddressSpace.cpp b/src/system/kernel/vm/VMUserAddressSpace.cpp
index 27af6a7e3a..ec82d37c04 100644
--- a/src/system/kernel/vm/VMUserAddressSpace.cpp
+++ b/src/system/kernel/vm/VMUserAddressSpace.cpp
@@ -218,6 +218,9 @@ VMUserAddressSpace::RemoveArea(VMArea* _area, uint32 allocationFlags)
 		IncrementChangeCount();
 		fFreeSpace += area->Size();
 	}
+
+	if ((area->Base() + area->Size()) == fNextInsertHint)
+		fNextInsertHint -= area->Size();
 }