diff --git a/backend/src/ee/services/external-kms/providers/aws-kms.ts b/backend/src/ee/services/external-kms/providers/aws-kms.ts
index 862239042..fb4d14b9f 100644
--- a/backend/src/ee/services/external-kms/providers/aws-kms.ts
+++ b/backend/src/ee/services/external-kms/providers/aws-kms.ts
@@ -107,10 +107,8 @@ export const AwsKmsProviderFactory = async ({ inputs }: AwsKmsProviderArgs): Pro
   const cleanup = async () => {
     try {
       awsClient.destroy();
-      return true;
     } catch (error) {
-      logger.error(error, "cleanup: failed to destroy AWS KMS client");
-      return false;
+      throw new Error("Failed to cleanup AWS KMS client", { cause: error });
     }
   };
 
diff --git a/backend/src/ee/services/external-kms/providers/gcp-kms.ts b/backend/src/ee/services/external-kms/providers/gcp-kms.ts
index 5abe0afc7..ff2820fe8 100644
--- a/backend/src/ee/services/external-kms/providers/gcp-kms.ts
+++ b/backend/src/ee/services/external-kms/providers/gcp-kms.ts
@@ -48,10 +48,8 @@ export const GcpKmsProviderFactory = async ({ inputs }: GcpKmsProviderArgs): Pro
   const cleanup = async () => {
     try {
       await gcpKmsClient.close();
-      return true;
     } catch (error) {
-      logger.error(error, "cleanup: failed to close GCP KMS client");
-      return false;
+      throw new Error("Failed to cleanup GCP KMS client", { cause: error });
     }
   };
 
diff --git a/backend/src/ee/services/external-kms/providers/model.ts b/backend/src/ee/services/external-kms/providers/model.ts
index 71f108dbc..6cb78a34e 100644
--- a/backend/src/ee/services/external-kms/providers/model.ts
+++ b/backend/src/ee/services/external-kms/providers/model.ts
@@ -98,5 +98,5 @@ export type TExternalKmsProviderFns = {
   validateConnection: () => Promise<boolean>;
   encrypt: (data: Buffer) => Promise<{ encryptedBlob: Buffer }>;
   decrypt: (encryptedBlob: Buffer) => Promise<{ data: Buffer }>;
-  cleanup: () => Promise<boolean>;
+  cleanup: () => Promise<void>;
 };