diff --git a/test/ruby/test_pipe.rb b/test/ruby/test_pipe.rb
index efca8f28c1..9fa42fd375 100644
--- a/test/ruby/test_pipe.rb
+++ b/test/ruby/test_pipe.rb
@@ -27,4 +27,23 @@ class TestPipe < Test::Unit::TestCase
       end
     end
   end
+
+  def test_stdout_epipe
+    assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      io = STDOUT
+      begin
+        save = io.dup
+        IO.popen("echo", "w", out: IO::NULL) do |f|
+          io.reopen(f)
+          Process.wait(f.pid)
+          assert_raise(Errno::EPIPE) do
+            io.print "foo\n"
+          end
+        end
+      ensure
+        io.reopen(save)
+      end
+    end;
+  end
 end
diff --git a/win32/win32.c b/win32/win32.c
index 699fc80467..0a43ac7118 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -7119,7 +7119,11 @@ rb_w32_write(int fd, const void *buf, size_t size)
 
     if ((_osfile(fd) & FTEXT) &&
         (!(_osfile(fd) & FPIPE) || fd == fileno(stdout) || fd == fileno(stderr))) {
-	return _write(fd, buf, size);
+	ssize_t w = _write(fd, buf, size);
+	if (w == (ssize_t)-1 && errno == EINVAL) {
+	    errno = map_errno(GetLastError());
+	}
+	return w;
     }
 
     rb_acrt_lowio_lock_fh(fd);