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 6c717a27717..a1839ebc3e1 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
@@ -241,8 +241,12 @@ public class WorksheetRepository extends EntityRepository<Worksheet> {
   }
 
   private void setDefaultFields(Worksheet worksheet) {
-    worksheet.withService(getContainer(worksheet.getId()));
-    worksheet.withSpreadsheet(getSpreadsheet(worksheet));
+    EntityReference spreadsheet = getSpreadsheet(worksheet);
+    EntityReference service =
+        getFromEntityRef(
+            spreadsheet.getId(), SPREADSHEET, Relationship.CONTAINS, Entity.DRIVE_SERVICE, true);
+    worksheet.withService(service);
+    worksheet.withSpreadsheet(spreadsheet);
   }
 
   @Override