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 37b8bd1cd..55f16bb2b 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
@@ -73,6 +73,10 @@
 	 */
 	.global _mt_kernel_entry_pic
 	_mt_kernel_entry_pic:
+
+	/* Copy client context RAX to buffer */
+	mov %rax, _mt_buffer
+
 	1: jmp 1b
 
 	.global _mt_user_entry_pic