diff --git a/src/add-ons/kernel/network/protocols/tcp/TCPEndpoint.cpp b/src/add-ons/kernel/network/protocols/tcp/TCPEndpoint.cpp
index 2f7b3840e8..ae76349b7b 100644
--- a/src/add-ons/kernel/network/protocols/tcp/TCPEndpoint.cpp
+++ b/src/add-ons/kernel/network/protocols/tcp/TCPEndpoint.cpp
@@ -846,7 +846,7 @@ TCPEndpoint::SendData(net_buffer *buffer)
 
 			if (!is_writable(fState) && !is_establishing(fState)) {
 				// we only send signals when called from userland
-				if (gStackModule->is_syscall())
+				if (gStackModule->is_syscall() && (flags & MSG_NOSIGNAL) == 0)
 					send_signal(find_thread(NULL), SIGPIPE);
 				return EPIPE;
 			}