From 601dc02ed71a7c6315c080e30d155fd2d3f56bf1 Mon Sep 17 00:00:00 2001
From: Paul Rastoin <45004772+prastoin@users.noreply.github.com>
Date: Tue, 7 Apr 2026 10:20:56 +0200
Subject: [PATCH] Fix s3 driver empty objects (#19361)

`undefined === 0` breaks the early return
---
 .../engine/core-modules/file-storage/drivers/s3.driver.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

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 e9031ff3a40..51ad265635e 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 };
         }),
       },