diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c
index b91698f6f422..36425547ff74 100644
--- a/sys/amd64/amd64/trap.c
+++ b/sys/amd64/amd64/trap.c
@@ -268,9 +268,9 @@ trap(struct trapframe *frame)
 
 			/*
 			 * We shouldn't enable interrupts while holding a
-			 * spin lock or servicing an NMI.
+			 * spin lock.
 			 */
-			if (type != T_NMI && td->td_md.md_spinlock_count == 0)
+			if (td->td_md.md_spinlock_count == 0)
 				enable_intr();
 		}
 	}