diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/DictionaryController.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/DictionaryController.java
index c3fdbd36b..3a34eaaad 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/DictionaryController.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/DictionaryController.java
@@ -207,7 +207,10 @@ public class DictionaryController implements DictionaryResource {
 
     @Override
     public Type getDictionaryForType(@PathVariable(TYPE_PARAMETER_NAME) String typeId) {
-        return convert(dictionaryPersistenceService.getType(typeId), Type.class);
+        var entity = dictionaryPersistenceService.getType(typeId);
+        var target = convert(entity, Type.class);
+        target.setEntries(convert(entity.getEntries(), DictionaryEntry.class));
+        return target;
     }
 
     @Override
diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/TypeTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/TypeTest.java
index 552fb35ca..1efa27aaa 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/TypeTest.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/TypeTest.java
@@ -42,6 +42,8 @@ public class TypeTest extends AbstractPersistenceServerServiceTest {
 
         var loadedType = dictionaryClient.getDictionaryForType(type.getId());
 
+        assertThat(loadedType.getEntries().size()).isEqualTo(3);
+
         assertThat(loadedType.getVersion()).isGreaterThan(type.getVersion());
 
         List<DictionaryEntry> dict = dictionaryClient.getEntriesForType(type.getId());