diff --git a/lib/csharp/src/Transport/TServerSocket.cs b/lib/csharp/src/Transport/TServerSocket.cs
index 218291a..fd5c662 100644
--- a/lib/csharp/src/Transport/TServerSocket.cs
+++ b/lib/csharp/src/Transport/TServerSocket.cs
@@ -91,6 +91,7 @@
 			{
 				// Make server socket
 				server = new TcpListener(System.Net.IPAddress.Any, this.port);
+				server.Server.NoDelay = true;
 			}
 			catch (Exception)
 			{
diff --git a/lib/csharp/src/Transport/TSocket.cs b/lib/csharp/src/Transport/TSocket.cs
index 4c64a36..feb5503 100644
--- a/lib/csharp/src/Transport/TSocket.cs
+++ b/lib/csharp/src/Transport/TSocket.cs
@@ -61,6 +61,7 @@
 		{
 			client = new TcpClient();
 			client.ReceiveTimeout = client.SendTimeout = timeout;
+			client.Client.NoDelay = true;
 		}
 
 		public int Timeout