diff --git a/src/fsfw/osal/common/TcpTmTcServer.cpp b/src/fsfw/osal/common/TcpTmTcServer.cpp
index 8b34b1a3b..7e6853fc1 100644
--- a/src/fsfw/osal/common/TcpTmTcServer.cpp
+++ b/src/fsfw/osal/common/TcpTmTcServer.cpp
@@ -168,7 +168,10 @@ void TcpTmTcServer::handleServerOperation(socket_t& connSocket) {
                 tcpConfig.tcpFlags
         );
         if(retval == 0) {
-            // Client closed connection
+            size_t availableReadData = ringBuffer.getAvailableReadData();
+            if(availableReadData > lastRingBufferSize) {
+                handleTcRingBufferData(availableReadData);
+            }
             return;
         }
         else if(retval > 0) {