diff --git a/bitnami/etcd/3.4/debian-12/rootfs/opt/bitnami/scripts/etcd/run.sh b/bitnami/etcd/3.4/debian-12/rootfs/opt/bitnami/scripts/etcd/run.sh
index e9ce00f19e690..a65f26f6530ba 100755
--- a/bitnami/etcd/3.4/debian-12/rootfs/opt/bitnami/scripts/etcd/run.sh
+++ b/bitnami/etcd/3.4/debian-12/rootfs/opt/bitnami/scripts/etcd/run.sh
@@ -18,7 +18,8 @@ set -o pipefail
 # Load etcd environment variables
 . /opt/bitnami/scripts/etcd-env.sh
 
-is_empty_value "$ETCD_ROOT_PASSWORD" && unset ETCD_ROOT_PASSWORD
+# We need to unset ETCD_ROOT_PASSWORD otherwise it will be logged by etcd process
+unset ETCD_ROOT_PASSWORD
 if [[ -f "$ETCD_NEW_MEMBERS_ENV_FILE" ]]; then
     debug "Loading env vars of existing cluster"
     . "$ETCD_NEW_MEMBERS_ENV_FILE"
diff --git a/bitnami/etcd/3.5/debian-12/rootfs/opt/bitnami/scripts/etcd/run.sh b/bitnami/etcd/3.5/debian-12/rootfs/opt/bitnami/scripts/etcd/run.sh
index e9ce00f19e690..2c77865163f14 100755
--- a/bitnami/etcd/3.5/debian-12/rootfs/opt/bitnami/scripts/etcd/run.sh
+++ b/bitnami/etcd/3.5/debian-12/rootfs/opt/bitnami/scripts/etcd/run.sh
@@ -18,7 +18,9 @@ set -o pipefail
 # Load etcd environment variables
 . /opt/bitnami/scripts/etcd-env.sh
 
-is_empty_value "$ETCD_ROOT_PASSWORD" && unset ETCD_ROOT_PASSWORD
+# We need to unset ETCD_ROOT_PASSWORD otherwise it will be logged by etcd process
+unset ETCD_ROOT_PASSWORD
+
 if [[ -f "$ETCD_NEW_MEMBERS_ENV_FILE" ]]; then
     debug "Loading env vars of existing cluster"
     . "$ETCD_NEW_MEMBERS_ENV_FILE"