diff --git a/sys/cddl/dev/fbt/x86/fbt_isa.c b/sys/cddl/dev/fbt/x86/fbt_isa.c
index 93b0bce39fed..794747618cec 100644
--- a/sys/cddl/dev/fbt/x86/fbt_isa.c
+++ b/sys/cddl/dev/fbt/x86/fbt_isa.c
@@ -146,11 +146,14 @@ fbt_invop(uintptr_t addr, struct trapframe *frame, uintptr_t rval)
 void
 fbt_patch_tracepoint(fbt_probe_t *fbt, fbt_patchval_t val)
 {
+	register_t intr;
 	bool old_wp;
 
+	intr = intr_disable();
 	old_wp = disable_wp();
 	*fbt->fbtp_patchpoint = val;
 	restore_wp(old_wp);
+	intr_restore(intr);
 }
 
 int