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 3bb669d37..e8ca23d02 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
@@ -119,6 +119,10 @@
 	mov CR3_OFFSET(%rax), %rax
 	mov %rax, %cr3
 
+	/* Set stack back to mt buffer and restore client RAX */
+	mov $_mt_buffer, %rsp
+	popq %rax
+
 	1: jmp 1b
 
 	/* end of the mode transition code */