diff --git a/ChangeLog b/ChangeLog
index cbdfbef..c8b833c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 Version 4.5.0.6 'dan Eider':
 	- Typos in the text fixed.
 	- TLS1.2 support fixed.
+	- uclient minor performance tweak.
 
 08/27/2016 Oleg Moskalenko <mom040267@gmail.com>
 Version 4.5.0.5 'dan Eider':
diff --git a/src/apps/uclient/uclient.c b/src/apps/uclient/uclient.c
index aa9a008..b842bfe 100644
--- a/src/apps/uclient/uclient.c
+++ b/src/apps/uclient/uclient.c
@@ -285,7 +285,7 @@ int send_buffer(app_ur_conn_info *clnet_info, stun_buffer* message, int data_con
 		while (left > 0) {
 			do {
 				rc = send(fd, buffer, left, 0);
-			} while (rc < 0 && ((errno == EINTR) || (errno == ENOBUFS)));
+			} while (rc <= 0 && ((errno == EINTR) || (errno == ENOBUFS) || (errno == EAGAIN)));
 			if (rc > 0) {
 				left -= (size_t) rc;
 				buffer += rc;