diff --git a/Net/src/HTTPClientSession.cpp b/Net/src/HTTPClientSession.cpp
index b79424217..bf536c988 100644
--- a/Net/src/HTTPClientSession.cpp
+++ b/Net/src/HTTPClientSession.cpp
@@ -205,7 +205,7 @@ std::ostream& HTTPClientSession::sendRequest(HTTPRequest& request)
 			reconnect();
 		if (!keepAlive)
 			request.setKeepAlive(false);
-		if (!request.has(HTTPRequest::HOST))
+		if (!request.has(HTTPRequest::HOST) && !_host.empty())
 			request.setHost(_host, _port);
 		if (!_proxyConfig.host.empty() && !bypassProxy())
 		{
diff --git a/Net/src/TCPServer.cpp b/Net/src/TCPServer.cpp
index 1619ca0ef..ca4bef5b3 100644
--- a/Net/src/TCPServer.cpp
+++ b/Net/src/TCPServer.cpp
@@ -120,8 +120,13 @@ void TCPServer::run()
 			try
 			{
 				StreamSocket ss = _socket.acceptConnection();
-				// enabe nodelay per default: OSX really needs that
-				ss.setNoDelay(true);
+				// enable nodelay per default: OSX really needs that
+#if defined(POCO_OS_FAMILY_UNIX)
+				if (ss.address().family() != AddressFamily::UNIX_LOCAL)
+#endif
+				{
+					ss.setNoDelay(true);
+				}
 				_pDispatcher->enqueue(ss);
 			}
 			catch (Poco::Exception& exc)