diff --git a/UnitTests/Tools_Tests.cs b/UnitTests/Tools_Tests.cs
index 9b45b525..8e53bbdc 100644
--- a/UnitTests/Tools_Tests.cs
+++ b/UnitTests/Tools_Tests.cs
@@ -190,7 +190,9 @@ sealed class ErrorData
         {
             { UsbSupError.USBSUP_XFER_OK, Errno.SUCCESS },
             { UsbSupError.USBSUP_XFER_STALL, Errno.EPIPE },
-            { UsbSupError.USBSUP_XFER_DNR, Errno.ETIME },
+            // HACK: see https://github.com/dorssel/usbipd-win/issues/807
+            // { UsbSupError.USBSUP_XFER_DNR, Errno.ETIME },
+            { UsbSupError.USBSUP_XFER_DNR, Errno.EPIPE },
             { UsbSupError.USBSUP_XFER_CRC, Errno.EILSEQ },
             { UsbSupError.USBSUP_XFER_NAC, Errno.EPROTO },
             { UsbSupError.USBSUP_XFER_UNDERRUN, Errno.EREMOTEIO },
diff --git a/Usbipd/Tools.cs b/Usbipd/Tools.cs
index 92d12e28..63b2f496 100644
--- a/Usbipd/Tools.cs
+++ b/Usbipd/Tools.cs
@@ -112,7 +112,9 @@ public static Errno ConvertError(UsbSupError usbSupError)
         {
             UsbSupError.USBSUP_XFER_OK => Errno.SUCCESS,
             UsbSupError.USBSUP_XFER_STALL => Errno.EPIPE,
-            UsbSupError.USBSUP_XFER_DNR => Errno.ETIME,
+            // HACK: see https://github.com/dorssel/usbipd-win/issues/807
+            // UsbSupError.USBSUP_XFER_DNR => Errno.ETIME,
+            UsbSupError.USBSUP_XFER_DNR => Errno.EPIPE,
             UsbSupError.USBSUP_XFER_CRC => Errno.EILSEQ,
             UsbSupError.USBSUP_XFER_NAC => Errno.EPROTO,
             UsbSupError.USBSUP_XFER_UNDERRUN => Errno.EREMOTEIO,