diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
index 8c1f479ddf58..7cbf4b1fa5e9 100644
--- a/drivers/iommu/arm-smmu.c
+++ b/drivers/iommu/arm-smmu.c
@@ -2013,6 +2013,9 @@ static int arm_smmu_domain_set_attr(struct iommu_domain *domain,
 		if (htw_disable)
 			smmu_domain->attributes |=
 				(1 << DOMAIN_ATTR_COHERENT_HTW_DISABLE);
+		else
+			smmu_domain->attributes &=
+				~(1 << DOMAIN_ATTR_COHERENT_HTW_DISABLE);
 		return 0;
 	}
 	default: