diff --git a/cockatrice/src/remoteclient.cpp b/cockatrice/src/remoteclient.cpp
index 640e84a7..04d88837 100644
--- a/cockatrice/src/remoteclient.cpp
+++ b/cockatrice/src/remoteclient.cpp
@@ -19,6 +19,7 @@ RemoteClient::RemoteClient(QObject *parent)
 	connect(timer, SIGNAL(timeout()), this, SLOT(ping()));
 
 	socket = new QTcpSocket(this);
+	socket->setSocketOption(QAbstractSocket::LowDelayOption, 1);
 	connect(socket, SIGNAL(connected()), this, SLOT(slotConnected()));
 	connect(socket, SIGNAL(readyRead()), this, SLOT(readData()));
 	connect(socket, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(slotSocketError(QAbstractSocket::SocketError)));
diff --git a/servatrice/src/servatrice.cpp b/servatrice/src/servatrice.cpp
index 368244b0..f0f89275 100644
--- a/servatrice/src/servatrice.cpp
+++ b/servatrice/src/servatrice.cpp
@@ -44,6 +44,7 @@ void Servatrice_GameServer::incomingConnection(int socketDescriptor)
 	} else {
 		QTcpSocket *socket = new QTcpSocket;
 		socket->setSocketDescriptor(socketDescriptor);
+		socket->setSocketOption(QAbstractSocket::LowDelayOption, 1);
 		ServerSocketInterface *ssi = new ServerSocketInterface(server, socket);
 		logger->logMessage(QString("incoming connection: %1").arg(socket->peerAddress().toString()), ssi);
 	}