diff --git a/sys/arm64/include/db_machdep.h b/sys/arm64/include/db_machdep.h
--- a/sys/arm64/include/db_machdep.h
+++ b/sys/arm64/include/db_machdep.h
@@ -49,8 +49,9 @@
 #define	BKPT_SIZE	(4)
 #define	BKPT_SET(inst)	(BKPT_INST)
 
-#define	BKPT_SKIP do {							\
-	kdb_frame->tf_elr += BKPT_SIZE; \
+#define	BKPT_SKIP do {				\
+	kdb_frame->tf_elr += BKPT_SIZE;		\
+	kdb_thrctx->pcb_lr += BKPT_SIZE;	\
 } while (0)
 
 #define	db_clear_single_step	kdb_cpu_clear_singlestep