diff --git a/backend/src/services/secret-v2-bridge/secret-v2-bridge-fns.ts b/backend/src/services/secret-v2-bridge/secret-v2-bridge-fns.ts
index 01a7f6210..c18a51ea4 100644
--- a/backend/src/services/secret-v2-bridge/secret-v2-bridge-fns.ts
+++ b/backend/src/services/secret-v2-bridge/secret-v2-bridge-fns.ts
@@ -421,11 +421,12 @@ export const fnSecretBulkDelete = async ({
   );
 
   const changes = deletedSecrets
-    .filter(({ type }) => type === SecretType.Shared)
+    .filter(({ type, id }) => type === SecretType.Shared && secretVersions[id])
     .map(({ id }) => ({
       type: CommitType.DELETE,
-      secretVersionId: secretVersions[id].id
+      secretVersionId: secretVersions[id]?.id
     }));
+
   if (changes.length > 0) {
     if (commitChanges) {
       commitChanges.push(...changes);
diff --git a/backend/src/services/secret-v2-bridge/secret-v2-bridge-service.ts b/backend/src/services/secret-v2-bridge/secret-v2-bridge-service.ts
index 559c86843..d42a26eff 100644
--- a/backend/src/services/secret-v2-bridge/secret-v2-bridge-service.ts
+++ b/backend/src/services/secret-v2-bridge/secret-v2-bridge-service.ts
@@ -2254,7 +2254,8 @@ export const secretV2BridgeServiceFactory = ({
         ]
       }
     });
-    if (secretsToDelete.length !== inputSecrets.length)
+    const secretsToDeleteSet = new Set(secretsToDelete.map((el) => el.key));
+    if (secretsToDeleteSet.size !== inputSecrets.length)
       throw new NotFoundError({
         message: `One or more secrets does not exist: ${secretsToDelete.map((el) => el.key).join(", ")}`
       });
diff --git a/frontend/src/helpers/project.ts b/frontend/src/helpers/project.ts
index 1a3114868..128dd31ce 100644
--- a/frontend/src/helpers/project.ts
+++ b/frontend/src/helpers/project.ts
@@ -14,11 +14,6 @@ const secretsToBeAdded = [
     secretValue: "OVERRIDE_THIS",
     secretComment: "Override secrets with personal value"
   },
-  {
-    secretKey: "DB_PASSWORD",
-    secretValue: "OVERRIDE_THIS",
-    secretComment: "Another secret override"
-  },
   {
     secretKey: "DB_PASSWORD",
     secretValue: "example_password"