diff --git a/backend/src/ee/services/secret-snapshot/snapshot-dal.ts b/backend/src/ee/services/secret-snapshot/snapshot-dal.ts
index d2dab8e06..12897e6b9 100644
--- a/backend/src/ee/services/secret-snapshot/snapshot-dal.ts
+++ b/backend/src/ee/services/secret-snapshot/snapshot-dal.ts
@@ -434,13 +434,12 @@ export const snapshotDALFactory = (db: TDbClient) => {
 
       // cleanup orphaned snapshots (those that don't belong to an existing folder and folder version)
       await db(TableName.Snapshot)
-        // eslint-disable-next-line func-names
         .whereNotIn("folderId", function () {
-          void this.select("folderId").from(TableName.SecretFolderVersion);
-        })
-        // eslint-disable-next-line func-names
-        .whereNotIn("folderId", function () {
-          void this.select("folderId").from(TableName.SecretFolder);
+          void this.select("folderId")
+            .from(TableName.SecretFolderVersion)
+            .union(function () {
+              void this.select("id").from(TableName.SecretFolder);
+            });
         })
         .delete();
     } catch (error) {