diff --git a/packages/twenty-server/src/modules/messaging/message-cleaner/services/messaging-message-cleaner.service.ts b/packages/twenty-server/src/modules/messaging/message-cleaner/services/messaging-message-cleaner.service.ts
index 636c71723e..173333fa27 100644
--- a/packages/twenty-server/src/modules/messaging/message-cleaner/services/messaging-message-cleaner.service.ts
+++ b/packages/twenty-server/src/modules/messaging/message-cleaner/services/messaging-message-cleaner.service.ts
@@ -55,6 +55,10 @@ export class MessagingMessageCleanerService {
           },
         });
 
+      if (messageChannelMessageAssociationsToDelete.length <= 0) {
+        continue;
+      }
+
       await messageChannelMessageAssociationRepository.delete(
         messageChannelMessageAssociationsToDelete.map(({ id }) => id),
       );
@@ -76,6 +80,10 @@ export class MessagingMessageCleanerService {
         },
       });
 
+      if (orphanMessages.length <= 0) {
+        continue;
+      }
+
       this.logger.log(
         `WorkspaceId: ${workspaceId} Deleting ${orphanMessages.length} orphan messages`,
       );
@@ -91,6 +99,10 @@ export class MessagingMessageCleanerService {
         },
       });
 
+      if (orphanMessageThreads.length <= 0) {
+        continue;
+      }
+
       this.logger.log(
         `WorkspaceId: ${workspaceId} Deleting ${orphanMessageThreads.length} orphan message threads`,
       );