diff --git a/sys/arm64/arm64/machdep.c b/sys/arm64/arm64/machdep.c
index 91f0a31ebe3..97f97392e43 100644
--- a/sys/arm64/arm64/machdep.c
+++ b/sys/arm64/arm64/machdep.c
@@ -561,6 +561,11 @@ exec_setregs(struct thread *td, struct image_params *imgp, uintptr_t stack)
 	tf->tf_lr = imgp->entry_addr;
 	tf->tf_elr = imgp->entry_addr;
 
+	td->td_pcb->pcb_tpidr_el0 = 0;
+	td->td_pcb->pcb_tpidrro_el0 = 0;
+	WRITE_SPECIALREG(tpidrro_el0, 0);
+	WRITE_SPECIALREG(tpidr_el0, 0);
+
 #ifdef VFP
 	vfp_reset_state(td, pcb);
 #endif
diff --git a/sys/arm64/linux/linux_sysvec.c b/sys/arm64/linux/linux_sysvec.c
index 67feacfa876..df16db4040a 100644
--- a/sys/arm64/linux/linux_sysvec.c
+++ b/sys/arm64/linux/linux_sysvec.c
@@ -365,6 +365,11 @@ linux_exec_setregs(struct thread *td, struct image_params *imgp,
 #endif
         regs->tf_elr = imgp->entry_addr;
 
+	td->td_pcb->pcb_tpidr_el0 = 0;
+	td->td_pcb->pcb_tpidrro_el0 = 0;
+	WRITE_SPECIALREG(tpidrro_el0, 0);
+	WRITE_SPECIALREG(tpidr_el0, 0);
+
 #ifdef VFP
 	vfp_reset_state(td, td->td_pcb);
 #endif