diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/EntityRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/EntityRepository.java
index 89fe17abec51..ceec49be8dff 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/EntityRepository.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/EntityRepository.java
@@ -563,6 +563,7 @@ public final List<T> listAll(Fields fields, ListFilter filter) {
     List<T> entities = new ArrayList<>();
     for (String json : jsons) {
       T entity = setFieldsInternal(JsonUtils.readValue(json, entityClass), fields);
+      entity = setInheritedFields(entity, fields);
       entity = clearFieldsInternal(entity, fields);
       entities.add(entity);
     }
@@ -578,6 +579,7 @@ public ResultList<T> listAfter(UriInfo uriInfo, Fields fields, ListFilter filter
 
       for (String json : jsons) {
         T entity = setFieldsInternal(JsonUtils.readValue(json, entityClass), fields);
+        entity = setInheritedFields(entity, fields);
         entity = clearFieldsInternal(entity, fields);
         entities.add(withHref(uriInfo, entity));
       }
@@ -610,6 +612,7 @@ public ResultList<T> listAfterWithSkipFailure(
       for (String json : jsons) {
         try {
           T entity = setFieldsInternal(JsonUtils.readValue(json, entityClass), fields);
+          entity = setInheritedFields(entity, fields);
           entity = clearFieldsInternal(entity, fields);
           entities.add(withHref(uriInfo, entity));
         } catch (Exception e) {
@@ -633,6 +636,7 @@ public ResultList<T> listBefore(UriInfo uriInfo, Fields fields, ListFilter filte
     List<T> entities = new ArrayList<>();
     for (String json : jsons) {
       T entity = setFieldsInternal(JsonUtils.readValue(json, entityClass), fields);
+      entity = setInheritedFields(entity, fields);
       entity = clearFieldsInternal(entity, fields);
       entities.add(withHref(uriInfo, entity));
     }
@@ -668,6 +672,7 @@ public T getVersion(UUID id, String version) {
 
   public EntityHistory listVersions(UUID id) {
     T latest = setFieldsInternal(find(id, ALL), putFields);
+    latest = setInheritedFields(latest, putFields);
     String extensionPrefix = EntityUtil.getVersionExtensionPrefix(entityType);
     List<ExtensionRecord> records = daoCollection.entityExtensionDAO().getExtensions(id, extensionPrefix);
     List<EntityVersionPair> oldVersions = new ArrayList<>();