diff --git a/util/telnet-client.c b/util/telnet-client.c
index 8401359..d8346e4 100644
--- a/util/telnet-client.c
+++ b/util/telnet-client.c
@@ -202,7 +202,11 @@
 	tcsetattr(STDOUT_FILENO, TCSADRAIN, &tios);
 
 	/* set input echoing on by default */
+#if NANO_BTS_CLI_CLIENT
+	do_echo = 0;
+#else
 	do_echo = 1;
+#endif
 
 	/* initialize telnet box */
 	telnet = telnet_init(telopts, _event_handler, 0, &sock);