diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c
index 4e4e0202e59d863838dfc66ae5ef6d5bbd8e1beb..395f253c0494b641652b0e126adb798ebee0e6df 100644
--- a/drivers/pci/intel-iommu.c
+++ b/drivers/pci/intel-iommu.c
@@ -1422,6 +1422,10 @@ static void domain_exit(struct dmar_domain *domain)
 	if (!domain)
 		return;
 
+	/* Flush any lazy unmaps that may reference this domain */
+	if (!intel_iommu_strict)
+		flush_unmaps_timeout(0);
+
 	domain_remove_dev_info(domain);
 	/* destroy iovas */
 	put_iova_domain(&domain->iovad);