diff --git a/src/fsfw/osal/common/TcpTmTcServer.cpp b/src/fsfw/osal/common/TcpTmTcServer.cpp
index fb421fc7d..c39361462 100644
--- a/src/fsfw/osal/common/TcpTmTcServer.cpp
+++ b/src/fsfw/osal/common/TcpTmTcServer.cpp
@@ -187,7 +187,7 @@ void TcpTmTcServer::handleServerOperation(socket_t& connSocket) {
                     return;
                 }
                 if(not tcAvailable and not tmSent) {
-                    TaskFactory::delayTask(DEFAULT_LOOP_DELAY_MS);
+                    TaskFactory::delayTask(tcpConfig.tcpLoopDelay);
                 }
             }
             else {
diff --git a/src/fsfw/osal/common/TcpTmTcServer.h b/src/fsfw/osal/common/TcpTmTcServer.h
index d52148483..da0e8bd5f 100644
--- a/src/fsfw/osal/common/TcpTmTcServer.h
+++ b/src/fsfw/osal/common/TcpTmTcServer.h
@@ -59,9 +59,10 @@ public:
         int tcpBacklog = 3;
 
         /**
-         * Passed to the select call which is used to ensure non-blocking TC reception
+         * If no telecommands packets are being received and no telemetry is being sent,
+         * the TCP server will delay periodically by this amount to decrease the CPU load
          */
-        //uint32_t selectTimeoutMs = DEFAULT_SELECT_TIMEOUT_MS;
+        uint32_t tcpLoopDelay = DEFAULT_LOOP_DELAY_MS ;
         /**
          * Passed to the send call
          */