diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/DatabaseRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/DatabaseRepository.java
index 29a89bad62b..807c5b0a9b1 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/DatabaseRepository.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/DatabaseRepository.java
@@ -28,6 +28,7 @@ import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Objects;
+import java.util.Set;
 import java.util.UUID;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.csv.CSVPrinter;
@@ -315,7 +316,7 @@ public class DatabaseRepository extends EntityRepository<Database> {
         for (Table table : tables) {
           // Add the table entity
           addEntityToCSV(csvFile, table, TABLE);
-
+          tableRepository.setFieldsInternal(table, new Fields(Set.of("columns", "tags")));
           // Add all columns as separate rows
           tableRepository.exportColumnsRecursively(table, csvFile);
         }
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/DatabaseSchemaRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/DatabaseSchemaRepository.java
index 545dceab1cd..f60d1c9d513 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/DatabaseSchemaRepository.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/DatabaseSchemaRepository.java
@@ -30,6 +30,7 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Objects;
+import java.util.Set;
 import java.util.UUID;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.csv.CSVPrinter;
@@ -210,6 +211,8 @@ public class DatabaseSchemaRepository extends EntityRepository<DatabaseSchema> {
         tableRepository.listAllForCSV(
             tableRepository.getFields("owners,tags,domain,extension"),
             schema.getFullyQualifiedName());
+    tables.forEach(
+        table -> tableRepository.setFieldsInternal(table, new Fields(Set.of("columns", "tags"))));
     tables.sort(Comparator.comparing(EntityInterface::getFullyQualifiedName));
 
     // Get stored procedures under this schema