diff --git a/winsup/cygwin/fhandler_fifo.cc b/winsup/cygwin/fhandler_fifo.cc
index 7a592aa0d..2c20444c6 100644
--- a/winsup/cygwin/fhandler_fifo.cc
+++ b/winsup/cygwin/fhandler_fifo.cc
@@ -867,4 +867,10 @@ fhandler_fifo::set_close_on_exec (bool val)
   fhandler_base::set_close_on_exec (val);
   set_no_inheritance (read_ready, val);
   set_no_inheritance (write_ready, val);
+  for (int i = 0; i < nclients; i++)
+    {
+      client[i].fh->fhandler_base::set_close_on_exec (val);
+      set_no_inheritance (client[i].connect_evt, val);
+      set_no_inheritance (client[i].dummy_evt, val);
+    }
 }