diff --git a/src/core/receiver/control_thread.cc b/src/core/receiver/control_thread.cc
index a9ab20e54..9ebda09d0 100644
--- a/src/core/receiver/control_thread.cc
+++ b/src/core/receiver/control_thread.cc
@@ -197,8 +197,12 @@ ControlThread::~ControlThread()
 
 void ControlThread::telecommand_listener()
 {
-    int tcp_cmd_port = configuration_->property("GNSS-SDR.telecontrol_tcp_port", 3333);
-    cmd_interface_.run_cmd_server(tcp_cmd_port);
+    bool telecommand_enabled = configuration_->property("GNSS-SDR.telecommand_enabled", false);
+    if (telecommand_enabled)
+        {
+            int tcp_cmd_port = configuration_->property("GNSS-SDR.telecommand_tcp_port", 3333);
+            cmd_interface_.run_cmd_server(tcp_cmd_port);
+        }
 }
 
 
@@ -295,7 +299,7 @@ int ControlThread::run()
 }
 
 
-void ControlThread::set_control_queue(const gr::msg_queue::sptr& control_queue)
+void ControlThread::set_control_queue(const gr::msg_queue::sptr &control_queue)
 {
     if (flowgraph_->running())
         {
diff --git a/src/core/receiver/tcp_cmd_interface.cc b/src/core/receiver/tcp_cmd_interface.cc
index cccb12857..57b274757 100644
--- a/src/core/receiver/tcp_cmd_interface.cc
+++ b/src/core/receiver/tcp_cmd_interface.cc
@@ -1,7 +1,7 @@
 /*!
  * \file tcp_cmd_interface.cc
  *
- * \brief Class that implements a TCP telecontrol command line interface
+ * \brief Class that implements a TCP/IP telecommand command line interface
  * for GNSS-SDR
  * \author Javier Arribas jarribas (at) cttc.es
  * -------------------------------------------------------------------------
diff --git a/src/core/receiver/tcp_cmd_interface.h b/src/core/receiver/tcp_cmd_interface.h
index 841270668..4cafb898d 100644
--- a/src/core/receiver/tcp_cmd_interface.h
+++ b/src/core/receiver/tcp_cmd_interface.h
@@ -1,7 +1,7 @@
 /*!
  * \file tcp_cmd_interface.h
  *
- * \brief Class that implements a TCP telecontrol command line interface
+ * \brief Class that implements a TCP/IP telecommand command line interface
  * for GNSS-SDR
  * \author Javier Arribas jarribas (at) cttc.es
  * -------------------------------------------------------------------------