diff --git a/Code/Network/NetworkAPI/NetworkClient.cpp b/Code/Network/NetworkAPI/NetworkClient.cpp
index 693ff701..72edaa8a 100644
--- a/Code/Network/NetworkAPI/NetworkClient.cpp
+++ b/Code/Network/NetworkAPI/NetworkClient.cpp
@@ -77,6 +77,8 @@ NetworkClient::PrivateData::PrivateData(unsigned int socket)
 	sendPostBox = new PostBox<CustomNetProtocol>;
 	this->thread.Create(this, false);
 
+	connection->SetBlockingMode(false);
+
 	Start();
 }
 
@@ -215,6 +217,8 @@ bool NetworkClient::Connect(unsigned short port, const char serverIP[])
 		return true;
 	}
 
+	privateData->connection->SetBlockingMode(false);
+
 	//Connect has failed
 	return false;
 }