diff --git a/iped-engine/src/main/java/iped/engine/datasource/UfedXmlReader.java b/iped-engine/src/main/java/iped/engine/datasource/UfedXmlReader.java
index a5235d57bf..090f4c2ca7 100644
--- a/iped-engine/src/main/java/iped/engine/datasource/UfedXmlReader.java
+++ b/iped-engine/src/main/java/iped/engine/datasource/UfedXmlReader.java
@@ -812,10 +812,10 @@ else if (item != null && !value.isEmpty()) {
                 // See https://github.com/sepinf-inc/IPED/issues/2299
                 String md5 = item.getMetadata().get(ExtraProperties.UFED_META_PREFIX + "MD5");
                 String localPath = item.getMetadata().get(LOCAL_PATH_META);
-                if (StringUtils.isNotBlank(md5)) {
-                    if (item.getIdInDataSource() != null && !md5ToLocalPath.containsKey(md5) && StringUtils.isNotBlank(localPath)) {
+                if (StringUtils.isNotBlank(md5) && md5.length() == 32) {
+                    if (item.getInputStreamFactory() != null && !md5ToLocalPath.containsKey(md5) && StringUtils.isNotBlank(localPath)) {
                         md5ToLocalPath.put(md5, localPath);
-                    } else if (item.getIdInDataSource() == null && md5ToLocalPath.containsKey(md5)) {
+                    } else if (item.getInputStreamFactory() == null && md5ToLocalPath.containsKey(md5)) {
                         String seenPath = md5ToLocalPath.get(md5);
                         setContent(item, seenPath);
                     }