diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/SearchIndex.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/SearchIndex.java
index ea88eea6648..d41714c54bd 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/SearchIndex.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/SearchIndex.java
@@ -36,13 +36,13 @@ public interface SearchIndex {
       Set.of("changeDescription", "lineage.pipeline.changeDescription");
 
   default Map<String, Object> buildSearchIndexDoc() {
-    Map<String, Object> esDoc = JsonUtils.getMap(getEntity());
+    // Build Index Doc
+    Map<String, Object> esDoc = this.buildSearchIndexDocInternal(JsonUtils.getMap(getEntity()));
 
     // Non Indexable Fields
     removeNonIndexableFields(esDoc);
 
-    // Build Index Doc
-    return this.buildSearchIndexDocInternal(esDoc);
+    return esDoc;
   }
 
   default void removeNonIndexableFields(Map<String, Object> esDoc) {