diff --git a/jnosql-elasticsearch/src/main/java/org/eclipse/jnosql/databases/elasticsearch/communication/ElasticsearchEntry.java b/jnosql-elasticsearch/src/main/java/org/eclipse/jnosql/databases/elasticsearch/communication/ElasticsearchEntry.java
index 10476a038..664f628c7 100644
--- a/jnosql-elasticsearch/src/main/java/org/eclipse/jnosql/databases/elasticsearch/communication/ElasticsearchEntry.java
+++ b/jnosql-elasticsearch/src/main/java/org/eclipse/jnosql/databases/elasticsearch/communication/ElasticsearchEntry.java
@@ -60,7 +60,8 @@ DocumentEntity toEntity() {
         List<Document> documents = map.keySet().stream()
                 .map(k -> toDocument(k, map))
                 .collect(Collectors.toList());
-        DocumentEntity entity = DocumentEntity.of(collection, documents);
+        DocumentEntity entity = DocumentEntity.of(collection);
+        documents.forEach(d-> entity.add(d.name(),d.value()));
         entity.remove(EntityConverter.ID_FIELD);
         entity.remove(EntityConverter.ENTITY);
         entity.add(id);