diff --git a/dockers/docker-sonic-telemetry/telemetry.sh b/dockers/docker-sonic-telemetry/telemetry.sh
index 053b1dae6ead..8cfd8a531cca 100755
--- a/dockers/docker-sonic-telemetry/telemetry.sh
+++ b/dockers/docker-sonic-telemetry/telemetry.sh
@@ -7,7 +7,7 @@ TELEMETRY=`sonic-cfggen -d -v 'TELEMETRY.keys() | join(" ") if TELEMETRY'`
 
 TELEMETRY_ARGS=" -logtostderr"
 
-if [ ! -z $X509 ]; then
+if [ -n "$X509" ]; then
 	SERVER_CRT=`sonic-cfggen -d -v "DEVICE_METADATA['x509']['server_crt']"`
 	SERVER_KEY=`sonic-cfggen -d -v "DEVICE_METADATA['x509']['server_key']"`
 	if [ -z $SERVER_CRT  ] || [ -z $SERVER_KEY  ]; then
@@ -19,7 +19,7 @@ else
 	TELEMETRY_ARGS+=" --insecure"
 fi
 
-if [ ! -z $X509 ]; then
+if [ -n "$X509" ]; then
 	CA_CRT=`sonic-cfggen -d -v "DEVICE_METADATA['x509']['ca_crt']"`
 	if [ ! -z $CA_CRT ]; then
 	    TELEMETRY_ARGS+=" --ca_crt $CA_CRT"
@@ -47,5 +47,3 @@ else
 fi
 
 exec /usr/sbin/telemetry ${TELEMETRY_ARGS}
-
-