diff --git a/dockers/docker-sonic-telemetry/telemetry.sh b/dockers/docker-sonic-telemetry/telemetry.sh
index 0fd80fcbfc..1f92657e3b 100755
--- a/dockers/docker-sonic-telemetry/telemetry.sh
+++ b/dockers/docker-sonic-telemetry/telemetry.sh
@@ -46,13 +46,12 @@ elif [ -n "$X509" ]; then
         TELEMETRY_ARGS+=" --ca_crt $CA_CRT"
     fi
 else
-    TELEMETRY_ARGS+=" --insecure"
+    TELEMETRY_ARGS+=" --noTLS"
 fi
 
 # If no configuration entry exists for TELEMETRY, create one default port
 if [ -z "$GNMI" ]; then
     PORT=8080
-    sonic-db-cli CONFIG_DB hset "TELEMETRY|gnmi" port $PORT
 else
     PORT=$(echo $GNMI | jq -r '.port')
 fi