diff --git a/ChangeLog.md b/ChangeLog.md
index a0ab78b93..76c4236d4 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -147,6 +147,7 @@ Nazara Engine:
 - ⚠️ CullingList now handles full and partial visibility testing
 - Added math class Angle, capable of handling both degrees and radians angles and converting them to euler angles/quaternions to improve 2D interface.
 - ⚠️ AbstractSocket::OnStateChange has been replaced by OnStateChanged, which is now called after state has been changed (with oldState and newState as parameters).
+- ⚠️ TcpClient::WaitForconnected now closes the socket on failure. 
 
 Nazara Development Kit:
 - Added ImageWidget (#139)
diff --git a/src/Nazara/Network/TcpClient.cpp b/src/Nazara/Network/TcpClient.cpp
index 56060b40e..41d06348d 100644
--- a/src/Nazara/Network/TcpClient.cpp
+++ b/src/Nazara/Network/TcpClient.cpp
@@ -467,9 +467,9 @@ namespace Nz
 				SocketState newState = SocketImpl::Connect(m_handle, m_peerAddress, msTimeout, &m_lastError);
 				NazaraAssert(newState != SocketState_Connecting, "Invalid internal return"); //< Connect cannot return Connecting is a timeout was specified
 
-				// Prevent valid peer address in non-connected state
+				// Prevent valid stats in non-connected state
 				if (newState == SocketState_NotConnected)
-					m_peerAddress = IpAddress::Invalid;
+					Close();
 
 				UpdateState(newState);
 				return newState == SocketState_Connected;