diff --git a/packages/service/common/secret/utils.ts b/packages/service/common/secret/utils.ts
index f54fe0c7de..c852304d3e 100644
--- a/packages/service/common/secret/utils.ts
+++ b/packages/service/common/secret/utils.ts
@@ -39,6 +39,11 @@ export const getSecretValue = ({
     const { secret, value } = val;
     const actualValue = value || decryptSecret(secret);
 
+    // Filter out empty values to avoid invalid headers
+    if (!actualValue || !key) {
+      return acc;
+    }
+
     if (key === HeaderSecretTypeEnum.Bearer) {
       acc['Authorization'] = `Bearer ${actualValue}`;
     } else if (key === HeaderSecretTypeEnum.Basic) {
diff --git a/projects/app/src/components/common/secret/HeaderAuthForm.tsx b/projects/app/src/components/common/secret/HeaderAuthForm.tsx
index 93d3990758..5c78c550f0 100644
--- a/projects/app/src/components/common/secret/HeaderAuthForm.tsx
+++ b/projects/app/src/components/common/secret/HeaderAuthForm.tsx
@@ -87,9 +87,9 @@ const AuthValueDisplay = ({
 };
 
 export const getSecretType = (config: HeaderSecretConfigType): HeaderSecretTypeEnum => {
-  if (config.Bearer && (config.Bearer.secret || config.Bearer.value)) {
+  if (config.Bearer) {
     return HeaderSecretTypeEnum.Bearer;
-  } else if (config.Basic && (config.Basic.secret || config.Basic.value)) {
+  } else if (config.Basic) {
     return HeaderSecretTypeEnum.Basic;
   } else if (config.customs && config.customs.length > 0) {
     return HeaderSecretTypeEnum.Custom;