diff --git a/arch/arm64/core/fatal.c b/arch/arm64/core/fatal.c
index a16d5219c3a..d02bbde2378 100644
--- a/arch/arm64/core/fatal.c
+++ b/arch/arm64/core/fatal.c
@@ -272,9 +272,7 @@ void z_arm64_do_kernel_oops(z_arch_esf_t *esf)
 #ifdef CONFIG_USERSPACE
 FUNC_NORETURN void arch_syscall_oops(void *ssf_ptr)
 {
-	ARG_UNUSED(ssf_ptr);
-
-	z_arm64_fatal_error(K_ERR_KERNEL_OOPS, NULL);
+	z_arm64_fatal_error(K_ERR_KERNEL_OOPS, ssf_ptr);
 	CODE_UNREACHABLE;
 }
 #endif
diff --git a/arch/arm64/core/userspace.S b/arch/arm64/core/userspace.S
index 2fab9e95f5e..599ede99d5a 100644
--- a/arch/arm64/core/userspace.S
+++ b/arch/arm64/core/userspace.S
@@ -96,6 +96,9 @@ SECTION_FUNC(TEXT, z_arm64_do_syscall)
 	ldp	x2, x3, [sp, ___esf_t_x2_x3_OFFSET]
 	ldp	x4, x5, [sp, ___esf_t_x4_x5_OFFSET]
 
+	/* Use the ESF as SSF */
+	mov	x6, sp
+
 	/* Recover the syscall ID */
 	ldr	x8, [sp, ___esf_t_x8_x9_OFFSET]
 
@@ -103,6 +106,9 @@ SECTION_FUNC(TEXT, z_arm64_do_syscall)
 	ldr	x9, =K_SYSCALL_LIMIT
 	cmp	x8, x9
 	blo	valid_syscall_id
+
+	/* Save the bad ID for handler_bad_syscall() */
+	mov	x0, x8
 	ldr	x8, =K_SYSCALL_BAD
 
 valid_syscall_id: