diff --git a/repos/base-hw/src/core/spec/x86_64/mode_transition.s b/repos/base-hw/src/core/spec/x86_64/mode_transition.s
index 55f16bb2b..86ecbf5d2 100644
--- a/repos/base-hw/src/core/spec/x86_64/mode_transition.s
+++ b/repos/base-hw/src/core/spec/x86_64/mode_transition.s
@@ -77,6 +77,10 @@
 	/* Copy client context RAX to buffer */
 	mov %rax, _mt_buffer
 
+	/* Switch to kernel page tables */
+	mov _mt_master_context_begin+CR3_OFFSET, %rax
+	mov %rax, %cr3
+
 	1: jmp 1b
 
 	.global _mt_user_entry_pic