diff --git a/repos/base-hw/src/core/spec/x86_64/kernel/thread_base.cc b/repos/base-hw/src/core/spec/x86_64/kernel/thread_base.cc
index f2bc3af0b7..a161565476 100644
--- a/repos/base-hw/src/core/spec/x86_64/kernel/thread_base.cc
+++ b/repos/base-hw/src/core/spec/x86_64/kernel/thread_base.cc
@@ -64,8 +64,9 @@ Thread_event Thread::* Thread::_event(unsigned const id) const
 void Thread::_mmu_exception()
 {
 	_become_inactive(AWAITS_RESUME);
-	_fault_pd    = (addr_t)_pd->platform_pd();
+	_fault_pd     = (addr_t)_pd->platform_pd();
 	_fault_signal = _fault.signal_context_id();
+	_fault_addr   = Cpu::Cr2::read();
 
 	/**
 	 * core should never raise a page-fault,