diff --git a/src/system/kernel/arch/x86/64/arch.S b/src/system/kernel/arch/x86/64/arch.S
index 4c4aaa66cc..78b3ac28f2 100644
--- a/src/system/kernel/arch/x86/64/arch.S
+++ b/src/system/kernel/arch/x86/64/arch.S
@@ -87,6 +87,8 @@ FUNCTION(arch_debug_call_with_fault_handler):
 
 	// Preserve the jump buffer address for the fault return.
 	push	%rsi
+	// Align the stack before calling the function.
+	subq	$8, %rsp
 
 	// Set fault handler address, and fault handler stack pointer address. We
 	// don't need to save the previous values, since that's done by the caller.