diff --git a/compat/mingw.c b/compat/mingw.c
index 15dcb0fbc3..b42749344e 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -812,7 +812,7 @@ ssize_t mingw_write(int fd, const void *buf, size_t len)
 {
 	ssize_t result = write(fd, buf, len);
 
-	if (result < 0 && (errno == EINVAL || errno == ENOSPC) && buf) {
+	if (result < 0 && (errno == EINVAL || errno == EBADF || errno == ENOSPC) && buf) {
 		int orig = errno;
 
 		/* check if fd is a pipe */
@@ -838,7 +838,7 @@ ssize_t mingw_write(int fd, const void *buf, size_t len)
 			}
 
 			errno = orig;
-		} else if (orig == EINVAL)
+		} else if (orig == EINVAL || errno == EBADF)
 			errno = EPIPE;
 		else {
 			DWORD buf_size;