diff --git a/msm/msm_smmu.c b/msm/msm_smmu.c
index 53f5f926560a..af9ba0ba87f5 100644
--- a/msm/msm_smmu.c
+++ b/msm/msm_smmu.c
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
  * Copyright (c) 2015-2020, The Linux Foundation. All rights reserved.
  * Copyright (C) 2013 Red Hat
  * Author: Rob Clark <robdclark@gmail.com>
@@ -211,6 +212,10 @@ static void msm_smmu_destroy(struct msm_mmu *mmu)
 {
 	struct msm_smmu *smmu = to_msm_smmu(mmu);
 	struct platform_device *pdev = to_platform_device(smmu->client_dev);
+	struct iommu_domain *domain = iommu_get_domain_for_dev(smmu->client_dev);
+
+	if (domain)
+		iommu_set_fault_handler(domain, NULL, NULL);
 
 	if (smmu->client_dev)
 		platform_device_unregister(pdev);