diff --git a/sys/dev/hwpmc/hwpmc_x86.c b/sys/dev/hwpmc/hwpmc_x86.c
--- a/sys/dev/hwpmc/hwpmc_x86.c
+++ b/sys/dev/hwpmc/hwpmc_x86.c
@@ -248,6 +248,7 @@
 				continue;
 			md->pmd_classdep[i].pcd_caps &= ~PMC_CAP_INTERRUPT;
 		}
+	nmi_register_handler(md->pmd_intr);
 
 	return (md);
 }
@@ -257,6 +258,7 @@
 {
 
 	lapic_disable_pcint();
+	nmi_remove_handler(md->pmd_intr);
 	if (cpu_vendor_id == CPU_VENDOR_AMD ||
 	    cpu_vendor_id == CPU_VENDOR_HYGON)
 		pmc_amd_finalize(md);