diff --git a/socket-handler.c b/socket-handler.c
index 6ebe10e..d9888b9 100644
--- a/socket-handler.c
+++ b/socket-handler.c
@@ -92,9 +92,12 @@
 {
 	size_t pos;
 	ssize_t rc;
+	int flags;
+
+	flags = MSG_DONTWAIT | MSG_NOSIGNAL;
 
 	for (pos = 0; pos < len; pos += rc) {
-		rc = send(client->fd, buf + pos, len - pos, MSG_DONTWAIT);
+		rc = send(client->fd, buf + pos, len - pos, flags);
 		if (rc < 0) {
 			if (errno == EAGAIN || errno == EWOULDBLOCK)
 				break;