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 1eb28abaa..0c620bb75 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
@@ -108,6 +108,13 @@
 	pushq %r9
 	pushq %r8
 
+	/* Restore kernel segment registers */
+	mov $0x10, %rbx
+	mov %rbx, %ds
+	mov %rbx, %es
+	mov %rbx, %fs
+	mov %rbx, %gs
+
 	1: jmp 1b
 
 	.global _mt_user_entry_pic