diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
index 09040be8d113..8e669f68f44b 100644
--- a/drivers/iommu/arm-smmu.c
+++ b/drivers/iommu/arm-smmu.c
@@ -2158,8 +2158,11 @@ static void arm_smmu_device_reset(struct arm_smmu_device *smmu)
 	/* Disable TLB broadcasting. */
 	reg |= (sCR0_VMIDPNE | sCR0_PTM);
 
-	/* Enable client access, but bypass when no mapping is found */
-	reg &= ~(sCR0_CLIENTPD | sCR0_USFCFG);
+	/* Enable client access */
+	reg &= ~sCR0_CLIENTPD;
+
+	/* Raise an unidentified stream fault on unmapped access */
+	reg |= sCR0_USFCFG;
 
 	/* Disable forced broadcasting */
 	reg &= ~sCR0_FB;