diff --git a/adb.cpp b/adb.cpp
index 548ca54..b83d164 100644
--- a/adb.cpp
+++ b/adb.cpp
@@ -888,6 +888,12 @@
         fprintf(stderr, "adb server killed by remote request\n");
         fflush(stdout);
         SendOkay(reply_fd);
+
+        // At least on Windows, if we exit() without shutdown(SD_SEND) or
+        // closesocket(), the client's next recv() will error-out with
+        // WSAECONNRESET and they'll never read the OKAY.
+        adb_shutdown(reply_fd);
+
         exit(0);
     }