diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index 97e0ec30..e5d40861 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -3259,8 +3259,9 @@ MHD_accept_connection (struct MHD_Daemon *daemon)
 #if defined(MHD_TCP_CORK_NOPUSH) || defined(HAVE_MSG_MORE)
   /* We will use TCP_CORK or TCP_NOPUSH or MSG_MORE to control
      transmission, disable Nagle's algorithm (always) */
-  if (0 != MHD_socket_set_nodelay_ (s,
-                                    true))
+  if ( (0 != MHD_socket_set_nodelay_ (s,
+                                      true)) &&
+       (EOPNOTSUPP != errno) )
   {
 #ifdef HAVE_MESSAGES
     MHD_DLOG (daemon,