diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/DirectoryRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/DirectoryRepository.java
index d87d67a433e..5ce795d44e0 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/DirectoryRepository.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/DirectoryRepository.java
@@ -133,12 +133,10 @@ public class DirectoryRepository extends EntityRepository<Directory> {
     // Inherit domain from parent or service if needed
     if (nullOrEmpty(directory.getDomains())) {
       if (directory.getParent() != null) {
-        Directory parent =
-            Entity.getEntity(directory.getParent(), FIELD_DOMAINS, Include.NON_DELETED);
+        Directory parent = Entity.getEntity(directory.getParent(), FIELD_DOMAINS, Include.ALL);
         inheritDomains(directory, fields, parent);
       } else {
-        DriveService service =
-            Entity.getEntity(directory.getService(), FIELD_DOMAINS, Include.NON_DELETED);
+        DriveService service = Entity.getEntity(directory.getService(), FIELD_DOMAINS, Include.ALL);
         inheritDomains(directory, fields, service);
       }
     }
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/FileRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/FileRepository.java
index e74fae64134..e3cfad43266 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/FileRepository.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/FileRepository.java
@@ -136,12 +136,10 @@ public class FileRepository extends EntityRepository<File> {
     // Inherit domain from directory if available, otherwise from service
     if (nullOrEmpty(file.getDomains())) {
       if (file.getDirectory() != null) {
-        Directory directory =
-            Entity.getEntity(file.getDirectory(), "domains,service", Include.NON_DELETED);
+        Directory directory = Entity.getEntity(file.getDirectory(), "domains,service", Include.ALL);
         inheritDomains(file, fields, directory);
       } else {
-        DriveService service =
-            Entity.getEntity(file.getService(), FIELD_DOMAINS, Include.NON_DELETED);
+        DriveService service = Entity.getEntity(file.getService(), FIELD_DOMAINS, Include.ALL);
         inheritDomains(file, fields, service);
       }
     }
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/SpreadsheetRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/SpreadsheetRepository.java
index 40de7d11a96..94390ee0919 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/SpreadsheetRepository.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/SpreadsheetRepository.java
@@ -145,11 +145,11 @@ public class SpreadsheetRepository extends EntityRepository<Spreadsheet> {
     if (nullOrEmpty(spreadsheet.getDomains())) {
       if (spreadsheet.getDirectory() != null) {
         Directory directory =
-            Entity.getEntity(spreadsheet.getDirectory(), "domains,service", Include.NON_DELETED);
+            Entity.getEntity(spreadsheet.getDirectory(), "domains,service", Include.ALL);
         inheritDomains(spreadsheet, fields, directory);
       } else {
         DriveService service =
-            Entity.getEntity(spreadsheet.getService(), FIELD_DOMAINS, Include.NON_DELETED);
+            Entity.getEntity(spreadsheet.getService(), FIELD_DOMAINS, Include.ALL);
         inheritDomains(spreadsheet, fields, service);
       }
     }
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/WorksheetRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/WorksheetRepository.java
index c50f972c406..87b9c1811bc 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/WorksheetRepository.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/WorksheetRepository.java
@@ -130,7 +130,7 @@ public class WorksheetRepository extends EntityRepository<Worksheet> {
     // Inherit domain from spreadsheet if not set
     if (nullOrEmpty(worksheet.getDomains())) {
       Spreadsheet spreadsheet =
-          Entity.getEntity(worksheet.getSpreadsheet(), "domains", Include.NON_DELETED);
+          Entity.getEntity(worksheet.getSpreadsheet(), "domains", Include.ALL);
       inheritDomains(worksheet, fields, spreadsheet);
     }
   }