diff --git a/sys/arm64/arm64/trap.c b/sys/arm64/arm64/trap.c
index b706f97852cf..482b9764fd02 100644
--- a/sys/arm64/arm64/trap.c
+++ b/sys/arm64/arm64/trap.c
@@ -323,7 +323,10 @@ do_el1h_sync(struct thread *td, struct trapframe *frame)
 			break;
 		}
 #endif
-		/* FALLTHROUGH */
+		kdb_trap(exception, 0,
+		    (td->td_frame != NULL) ? td->td_frame : frame);
+		frame->tf_elr -= 4;
+		break;
 	case EXCP_WATCHPT_EL1:
 	case EXCP_SOFTSTP_EL1:
 #ifdef KDB