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 50453b21f..f467032af 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
@@ -133,6 +133,8 @@
 	popq %rsi
 	popq %rbp
 
+	/* Restore kernel stack and continue kernel execution */
+	mov _mt_master_context_begin+SP_OFFSET, %rsp
 	1: jmp 1b
 
 	.global _mt_user_entry_pic