diff --git a/PlantBox.Broker/TcpManager.cs b/PlantBox.Broker/TcpManager.cs
index bd40fb9..c928ba0 100644
--- a/PlantBox.Broker/TcpManager.cs
+++ b/PlantBox.Broker/TcpManager.cs
@@ -52,9 +52,9 @@ namespace PlantBox.Broker
 
         private void ClientLoop(TcpClient client)
         {
-            using (var commandStream = new CommandStream(client.GetStream()))
+            try
             {
-                try
+                using (var commandStream = new CommandStream(client.GetStream()))
                 {
                     while (client.Connected)
                     {
@@ -79,10 +79,12 @@ namespace PlantBox.Broker
                         }
                     }
                 }
-                catch (Exception ex)
-                {
-                    Log($"Client disconnected: {ex.Message}");
-                }
+
+                client.Close();
+            }
+            catch (Exception ex)
+            {
+                Log($"Client disconnected: {ex.Message}");
             }
         }