diff --git a/src/Engine/Network/Client.cpp b/src/Engine/Network/Client.cpp
index a417c4e5..f01509b4 100644
--- a/src/Engine/Network/Client.cpp
+++ b/src/Engine/Network/Client.cpp
@@ -42,11 +42,10 @@ void Client::Update()
 
 void Client::Close()
 {
-    if (m_WasStarted) {
-        disconnect();
-        m_ThreadIsRunning = false;
-        m_EventBroker->Unsubscribe(m_EInputCommand);
-    }
+    disconnect();
+    m_ThreadIsRunning = false;
+    m_Socket.close();
+    m_EventBroker->Unsubscribe(m_EInputCommand);
 }
 
 void Client::readFromServer()
diff --git a/src/Engine/Network/Server.cpp b/src/Engine/Network/Server.cpp
index c53dce8f..bedbf954 100644
--- a/src/Engine/Network/Server.cpp
+++ b/src/Engine/Network/Server.cpp
@@ -28,7 +28,6 @@ void Server::Close()
 {
     m_ThreadIsRunning = false;
     m_Socket.close();
-
 }
 
 void Server::readFromClients()