diff --git a/sys/x86/iommu/intel_qi.c b/sys/x86/iommu/intel_qi.c
index 894e3d537ac..ca58715a227 100644
--- a/sys/x86/iommu/intel_qi.c
+++ b/sys/x86/iommu/intel_qi.c
@@ -343,6 +343,16 @@ dmar_qi_task(void *arg, int pending __unused)
 
 	unit = arg;
 
+	/*
+	 * Request an interrupt on the completion of the next invalidation
+	 * wait descriptor with the IF field set.
+	 */
+	ics = dmar_read4(unit, DMAR_ICS_REG);
+	if ((ics & DMAR_ICS_IWC) != 0) {
+		ics = DMAR_ICS_IWC;
+		dmar_write4(unit, DMAR_ICS_REG, ics);
+	}
+
 	DMAR_LOCK(unit);
 	for (;;) {
 		entry = TAILQ_FIRST(&unit->tlb_flush_entries);
@@ -356,11 +366,6 @@ dmar_qi_task(void *arg, int pending __unused)
 		    IOMMU_MAP_ENTRY_QI_NF) == 0);
 		DMAR_LOCK(unit);
 	}
-	ics = dmar_read4(unit, DMAR_ICS_REG);
-	if ((ics & DMAR_ICS_IWC) != 0) {
-		ics = DMAR_ICS_IWC;
-		dmar_write4(unit, DMAR_ICS_REG, ics);
-	}
 	if (unit->inv_seq_waiters > 0)
 		wakeup(&unit->inv_seq_waiters);
 	DMAR_UNLOCK(unit);