diff --git a/packages/twenty-server/src/engine/core-modules/file-storage/drivers/s3.driver.ts b/packages/twenty-server/src/engine/core-modules/file-storage/drivers/s3.driver.ts
index e9031ff3a4..51ad265635 100644
--- a/packages/twenty-server/src/engine/core-modules/file-storage/drivers/s3.driver.ts
+++ b/packages/twenty-server/src/engine/core-modules/file-storage/drivers/s3.driver.ts
@@ -443,12 +443,16 @@ export class S3Driver implements StorageDriver {
   private async emptyS3Directory(folderPath: string) {
     const listedObjects = await this.fetchS3FolderContents(folderPath);
 
-    if (listedObjects.Contents?.length === 0) return;
+    if (
+      !isDefined(listedObjects.Contents) ||
+      listedObjects.Contents.length === 0
+    )
+      return;
 
     const deleteParams = {
       Bucket: this.bucketName,
       Delete: {
-        Objects: listedObjects.Contents?.map(({ Key }) => {
+        Objects: listedObjects.Contents.map(({ Key }) => {
           return { Key };
         }),
       },