diff --git a/src/system/kernel/arch/x86/64/entry_compat.S b/src/system/kernel/arch/x86/64/entry_compat.S
index 855044ae9c..1e58379183 100644
--- a/src/system/kernel/arch/x86/64/entry_compat.S
+++ b/src/system/kernel/arch/x86/64/entry_compat.S
@@ -152,6 +152,7 @@ FUNCTION_END(x86_64_syscall32_entry)
 //	ecx - user esp
 FUNCTION(x86_64_sysenter32_entry):
 	swapgs
+	lfence
 
 	// Set up an iframe on the stack (ECX = saved ESP).
 	push	$USER_DATA_SELECTOR			// ss
@@ -314,6 +315,7 @@ FUNCTION(x86_64_sysenter32_entry):
 
 	// Restore previous GS base and return.
 	swapgs
+	lfence
 	sti
 	sysexit
 
diff --git a/src/system/kernel/arch/x86/64/interrupts.S b/src/system/kernel/arch/x86/64/interrupts.S
index 3672c1ca0b..f58135cace 100644
--- a/src/system/kernel/arch/x86/64/interrupts.S
+++ b/src/system/kernel/arch/x86/64/interrupts.S
@@ -244,6 +244,7 @@ FUNCTION_END(int_bottom)
 STATIC_FUNCTION(int_bottom_user):
 	// Load the kernel GS segment base.
 	swapgs
+	lfence
 
 	// Push the rest of the interrupt frame to the stack.
 	PUSH_IFRAME_BOTTOM(IFRAME_TYPE_OTHER)
@@ -293,6 +294,7 @@ STATIC_FUNCTION(int_bottom_user):
 
 	// Restore the previous GS base and return.
 	swapgs
+	lfence
 	iretq
 
 .Lkernel_exit_work:
@@ -321,6 +323,7 @@ STATIC_FUNCTION(int_bottom_user):
 
 	// Restore the previous GS base and return.
 	swapgs
+	lfence
 	iretq
 
 .Lkernel_exit_handle_signals:
@@ -340,6 +343,7 @@ FUNCTION(x86_64_syscall_entry):
 	// scratch space to store the user stack pointer in before we can push it
 	// to the stack.
 	swapgs
+	lfence
 	movq	%rsp, %gs:ARCH_THREAD_user_rsp
 	movq	%gs:ARCH_THREAD_syscall_rsp, %rsp
 
@@ -452,6 +456,7 @@ FUNCTION(x86_64_syscall_entry):
 
 	// Restore previous GS base and return.
 	swapgs
+	lfence
 	sysretq
 
 .Lpre_syscall_debug:
@@ -525,6 +530,7 @@ FUNCTION(x86_64_syscall_entry):
 
 	// Restore the previous GS base and return.
 	swapgs
+	lfence
 	iretq
 
 .Lpost_syscall_handle_signals:
@@ -601,6 +607,7 @@ FUNCTION(x86_return_to_userland):
 	// Restore the frame and return.
 	RESTORE_IFRAME()
 	swapgs
+	lfence
 	iretq
 .Luserland_return_work:
 	// Slow path for return to userland.
@@ -625,6 +632,7 @@ FUNCTION(x86_return_to_userland):
 
 	// Restore the previous GS base and return.
 	swapgs
+	lfence
 	iretq
 .Luserland_return_handle_signals:
 	// thread_at_kernel_exit requires interrupts to be enabled, it will disable