diff --git a/agent/alpine/docker-entrypoint.sh b/agent/alpine/docker-entrypoint.sh
index 6075530a6..2c215dc81 100755
--- a/agent/alpine/docker-entrypoint.sh
+++ b/agent/alpine/docker-entrypoint.sh
@@ -51,7 +51,7 @@ update_config_var() {
         return
     fi
 
-    if [[ " ${masklist[@]} " =~ " $var_name " ]]; then
+    if [[ " ${masklist[@]} " =~ " $var_name " ]] && [ ! -z "$var_value" ]; then
         echo -n "** Updating '$config_path' parameter \"$var_name\": '****'. Enable DEBUG_MODE to view value ..."
     else
         echo -n "** Updating '$config_path' parameter \"$var_name\": '$var_value'..."
diff --git a/agent/centos/docker-entrypoint.sh b/agent/centos/docker-entrypoint.sh
index 6075530a6..2c215dc81 100755
--- a/agent/centos/docker-entrypoint.sh
+++ b/agent/centos/docker-entrypoint.sh
@@ -51,7 +51,7 @@ update_config_var() {
         return
     fi
 
-    if [[ " ${masklist[@]} " =~ " $var_name " ]]; then
+    if [[ " ${masklist[@]} " =~ " $var_name " ]] && [ ! -z "$var_value" ]; then
         echo -n "** Updating '$config_path' parameter \"$var_name\": '****'. Enable DEBUG_MODE to view value ..."
     else
         echo -n "** Updating '$config_path' parameter \"$var_name\": '$var_value'..."
diff --git a/agent/ubuntu/docker-entrypoint.sh b/agent/ubuntu/docker-entrypoint.sh
index 6075530a6..2c215dc81 100755
--- a/agent/ubuntu/docker-entrypoint.sh
+++ b/agent/ubuntu/docker-entrypoint.sh
@@ -51,7 +51,7 @@ update_config_var() {
         return
     fi
 
-    if [[ " ${masklist[@]} " =~ " $var_name " ]]; then
+    if [[ " ${masklist[@]} " =~ " $var_name " ]] && [ ! -z "$var_value" ]; then
         echo -n "** Updating '$config_path' parameter \"$var_name\": '****'. Enable DEBUG_MODE to view value ..."
     else
         echo -n "** Updating '$config_path' parameter \"$var_name\": '$var_value'..."
diff --git a/proxy-mysql/alpine/docker-entrypoint.sh b/proxy-mysql/alpine/docker-entrypoint.sh
index 18daad6fa..59210c305 100755
--- a/proxy-mysql/alpine/docker-entrypoint.sh
+++ b/proxy-mysql/alpine/docker-entrypoint.sh
@@ -81,7 +81,7 @@ update_config_var() {
         return
     fi
 
-    if [[ " ${masklist[@]} " =~ " $var_name " ]]; then
+    if [[ " ${masklist[@]} " =~ " $var_name " ]] && [ ! -z "$var_value" ]; then
         echo -n "** Updating '$config_path' parameter \"$var_name\": '****'. Enable DEBUG_MODE to view value ..."
     else
         echo -n "** Updating '$config_path' parameter \"$var_name\": '$var_value'..."
diff --git a/proxy-mysql/centos/docker-entrypoint.sh b/proxy-mysql/centos/docker-entrypoint.sh
index 0c0f3bac0..9fdf41782 100755
--- a/proxy-mysql/centos/docker-entrypoint.sh
+++ b/proxy-mysql/centos/docker-entrypoint.sh
@@ -81,7 +81,7 @@ update_config_var() {
         return
     fi
 
-    if [[ " ${masklist[@]} " =~ " $var_name " ]]; then
+    if [[ " ${masklist[@]} " =~ " $var_name " ]] && [ ! -z "$var_value" ]; then
         echo -n "** Updating '$config_path' parameter \"$var_name\": '****'. Enable DEBUG_MODE to view value ..."
     else
         echo -n "** Updating '$config_path' parameter \"$var_name\": '$var_value'..."
diff --git a/proxy-mysql/ubuntu/docker-entrypoint.sh b/proxy-mysql/ubuntu/docker-entrypoint.sh
index 00eed239f..c904f6d49 100755
--- a/proxy-mysql/ubuntu/docker-entrypoint.sh
+++ b/proxy-mysql/ubuntu/docker-entrypoint.sh
@@ -81,7 +81,7 @@ update_config_var() {
         return
     fi
 
-    if [[ " ${masklist[@]} " =~ " $var_name " ]]; then
+    if [[ " ${masklist[@]} " =~ " $var_name " ]] && [ ! -z "$var_value" ]; then
         echo -n "** Updating '$config_path' parameter \"$var_name\": '****'. Enable DEBUG_MODE to view value ..."
     else
         echo -n "** Updating '$config_path' parameter \"$var_name\": '$var_value'..."
diff --git a/proxy-sqlite3/alpine/docker-entrypoint.sh b/proxy-sqlite3/alpine/docker-entrypoint.sh
index 66c3b3326..b4987d07f 100755
--- a/proxy-sqlite3/alpine/docker-entrypoint.sh
+++ b/proxy-sqlite3/alpine/docker-entrypoint.sh
@@ -50,7 +50,7 @@ update_config_var() {
         return
     fi
 
-    if [[ " ${masklist[@]} " =~ " $var_name " ]]; then
+    if [[ " ${masklist[@]} " =~ " $var_name " ]] && [ ! -z "$var_value" ]; then
         echo -n "** Updating '$config_path' parameter \"$var_name\": '****'. Enable DEBUG_MODE to view value ..."
     else
         echo -n "** Updating '$config_path' parameter \"$var_name\": '$var_value'..."
diff --git a/proxy-sqlite3/centos/docker-entrypoint.sh b/proxy-sqlite3/centos/docker-entrypoint.sh
index 66c3b3326..b4987d07f 100755
--- a/proxy-sqlite3/centos/docker-entrypoint.sh
+++ b/proxy-sqlite3/centos/docker-entrypoint.sh
@@ -50,7 +50,7 @@ update_config_var() {
         return
     fi
 
-    if [[ " ${masklist[@]} " =~ " $var_name " ]]; then
+    if [[ " ${masklist[@]} " =~ " $var_name " ]] && [ ! -z "$var_value" ]; then
         echo -n "** Updating '$config_path' parameter \"$var_name\": '****'. Enable DEBUG_MODE to view value ..."
     else
         echo -n "** Updating '$config_path' parameter \"$var_name\": '$var_value'..."
diff --git a/proxy-sqlite3/ubuntu/docker-entrypoint.sh b/proxy-sqlite3/ubuntu/docker-entrypoint.sh
index b3ab89118..a33618ab4 100755
--- a/proxy-sqlite3/ubuntu/docker-entrypoint.sh
+++ b/proxy-sqlite3/ubuntu/docker-entrypoint.sh
@@ -50,7 +50,7 @@ update_config_var() {
         return
     fi
 
-    if [[ " ${masklist[@]} " =~ " $var_name " ]]; then
+    if [[ " ${masklist[@]} " =~ " $var_name " ]] && [ ! -z "$var_value" ]; then
         echo -n "** Updating '$config_path' parameter \"$var_name\": '****'. Enable DEBUG_MODE to view value ..."
     else
         echo -n "** Updating '$config_path' parameter \"$var_name\": '$var_value'..."
diff --git a/server-mysql/alpine/docker-entrypoint.sh b/server-mysql/alpine/docker-entrypoint.sh
index f30c1cd37..2a6629615 100755
--- a/server-mysql/alpine/docker-entrypoint.sh
+++ b/server-mysql/alpine/docker-entrypoint.sh
@@ -76,7 +76,7 @@ update_config_var() {
         return
     fi
 
-    if [[ " ${masklist[@]} " =~ " $var_name " ]]; then
+    if [[ " ${masklist[@]} " =~ " $var_name " ]] && [ ! -z "$var_value" ]; then
         echo -n "** Updating '$config_path' parameter \"$var_name\": '****'. Enable DEBUG_MODE to view value ..."
     else
         echo -n "** Updating '$config_path' parameter \"$var_name\": '$var_value'..."
diff --git a/server-mysql/centos/docker-entrypoint.sh b/server-mysql/centos/docker-entrypoint.sh
index f30c1cd37..2a6629615 100755
--- a/server-mysql/centos/docker-entrypoint.sh
+++ b/server-mysql/centos/docker-entrypoint.sh
@@ -76,7 +76,7 @@ update_config_var() {
         return
     fi
 
-    if [[ " ${masklist[@]} " =~ " $var_name " ]]; then
+    if [[ " ${masklist[@]} " =~ " $var_name " ]] && [ ! -z "$var_value" ]; then
         echo -n "** Updating '$config_path' parameter \"$var_name\": '****'. Enable DEBUG_MODE to view value ..."
     else
         echo -n "** Updating '$config_path' parameter \"$var_name\": '$var_value'..."
diff --git a/server-mysql/ubuntu/docker-entrypoint.sh b/server-mysql/ubuntu/docker-entrypoint.sh
index 77617c756..59773fb50 100755
--- a/server-mysql/ubuntu/docker-entrypoint.sh
+++ b/server-mysql/ubuntu/docker-entrypoint.sh
@@ -76,7 +76,7 @@ update_config_var() {
         return
     fi
 
-    if [[ " ${masklist[@]} " =~ " $var_name " ]]; then
+    if [[ " ${masklist[@]} " =~ " $var_name " ]] && [ ! -z "$var_value" ]; then
         echo -n "** Updating '$config_path' parameter \"$var_name\": '****'. Enable DEBUG_MODE to view value ..."
     else
         echo -n "** Updating '$config_path' parameter \"$var_name\": '$var_value'..."
diff --git a/server-pgsql/alpine/docker-entrypoint.sh b/server-pgsql/alpine/docker-entrypoint.sh
index bbdecc162..bceb400bc 100755
--- a/server-pgsql/alpine/docker-entrypoint.sh
+++ b/server-pgsql/alpine/docker-entrypoint.sh
@@ -79,7 +79,7 @@ update_config_var() {
         return
     fi
 
-    if [[ " ${masklist[@]} " =~ " $var_name " ]]; then
+    if [[ " ${masklist[@]} " =~ " $var_name " ]] && [ ! -z "$var_value" ]; then
         echo -n "** Updating '$config_path' parameter \"$var_name\": '****'. Enable DEBUG_MODE to view value ..."
     else
         echo -n "** Updating '$config_path' parameter \"$var_name\": '$var_value'..."
diff --git a/server-pgsql/centos/docker-entrypoint.sh b/server-pgsql/centos/docker-entrypoint.sh
index bbdecc162..bceb400bc 100755
--- a/server-pgsql/centos/docker-entrypoint.sh
+++ b/server-pgsql/centos/docker-entrypoint.sh
@@ -79,7 +79,7 @@ update_config_var() {
         return
     fi
 
-    if [[ " ${masklist[@]} " =~ " $var_name " ]]; then
+    if [[ " ${masklist[@]} " =~ " $var_name " ]] && [ ! -z "$var_value" ]; then
         echo -n "** Updating '$config_path' parameter \"$var_name\": '****'. Enable DEBUG_MODE to view value ..."
     else
         echo -n "** Updating '$config_path' parameter \"$var_name\": '$var_value'..."
diff --git a/server-pgsql/ubuntu/docker-entrypoint.sh b/server-pgsql/ubuntu/docker-entrypoint.sh
index f57160fc6..eb12f9773 100755
--- a/server-pgsql/ubuntu/docker-entrypoint.sh
+++ b/server-pgsql/ubuntu/docker-entrypoint.sh
@@ -79,7 +79,7 @@ update_config_var() {
         return
     fi
 
-    if [[ " ${masklist[@]} " =~ " $var_name " ]]; then
+    if [[ " ${masklist[@]} " =~ " $var_name " ]] && [ ! -z "$var_value" ]; then
         echo -n "** Updating '$config_path' parameter \"$var_name\": '****'. Enable DEBUG_MODE to view value ..."
     else
         echo -n "** Updating '$config_path' parameter \"$var_name\": '$var_value'..."