diff --git a/jnosql-mapping/jnosql-mapping-semistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/ParameterConverter.java b/jnosql-mapping/jnosql-mapping-semistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/ParameterConverter.java
index 2318b7661..e345cbce6 100644
--- a/jnosql-mapping/jnosql-mapping-semistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/ParameterConverter.java
+++ b/jnosql-mapping/jnosql-mapping-semistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/ParameterConverter.java
@@ -88,7 +88,7 @@ abstract void convert(EntityConverter converter,
     static ParameterConverter of(ParameterMetaData parameter, EntitiesMetadata entities) {
         return switch (parameter.mappingType()) {
             case COLLECTION -> validateCollection(parameter, entities);
-            case ENTITY -> ENTITY;
+            case ENTITY, EMBEDDED_GROUP -> ENTITY;
             default -> DEFAULT;
         };
     }
diff --git a/jnosql-mapping/jnosql-mapping-semistructured/src/test/java/org/eclipse/jnosql/mapping/semistructured/EntityConverterConstructorTest.java b/jnosql-mapping/jnosql-mapping-semistructured/src/test/java/org/eclipse/jnosql/mapping/semistructured/EntityConverterConstructorTest.java
index ab57b275d..141e1723c 100644
--- a/jnosql-mapping/jnosql-mapping-semistructured/src/test/java/org/eclipse/jnosql/mapping/semistructured/EntityConverterConstructorTest.java
+++ b/jnosql-mapping/jnosql-mapping-semistructured/src/test/java/org/eclipse/jnosql/mapping/semistructured/EntityConverterConstructorTest.java
@@ -240,13 +240,13 @@ void shouldConvertGroupEmbeddable(){
         entity.add("factory", List.of(Element.of("name", "Napa Valley Factory"),
                 Element.of("location", "Napa Valley")));
 
-        Beer wine = converter.toEntity(entity);
+        Beer beer = converter.toEntity(entity);
 
         SoftAssertions.assertSoftly(soft ->{
-            var factory = wine.factory();
-            soft.assertThat(wine).isNotNull();
-            soft.assertThat(wine.id()).isEqualTo("id");
-            soft.assertThat(wine.name()).isEqualTo("Vin Blanc");
+            var factory = beer.factory();
+            soft.assertThat(beer).isNotNull();
+            soft.assertThat(beer.id()).isEqualTo("id");
+            soft.assertThat(beer.name()).isEqualTo("Vin Blanc");
             soft.assertThat(factory).isNotNull();
             soft.assertThat(factory.name()).isEqualTo("Napa Valley Factory");
             soft.assertThat(factory.location()).isEqualTo("Napa Valley");
@@ -263,7 +263,7 @@ void shouldConvertGroupEmbeddableToCommunication(){
 
         SoftAssertions.assertSoftly(soft ->{
             soft.assertThat(communication).isNotNull();
-            soft.assertThat(communication.name()).isEqualTo("Wine");
+            soft.assertThat(communication.name()).isEqualTo("Beer");
             soft.assertThat(communication.find("_id").orElseThrow().get()).isEqualTo("id");
             soft.assertThat(communication.find("name").orElseThrow().get()).isEqualTo("Vin Blanc");
             communication.find("factory").ifPresent(e -> {