diff --git a/file_sync_client.cpp b/file_sync_client.cpp
index b7e835b..8c9f7a6 100644
--- a/file_sync_client.cpp
+++ b/file_sync_client.cpp
@@ -65,7 +65,15 @@
     ~SyncConnection() {
         if (!IsValid()) return;
 
-        SendQuit();
+        if (SendQuit()) {
+            // We sent a quit command, so the server should be doing orderly
+            // shutdown soon. But if we encountered an error while we were using
+            // the connection, the server might still be sending data (before
+            // doing orderly shutdown), in which case we won't wait for all of
+            // the data nor the coming orderly shutdown. In the common success
+            // case, this will wait for the server to do orderly shutdown.
+            ReadOrderlyShutdown(fd);
+        }
         adb_close(fd);
     }
 
@@ -201,8 +209,8 @@
 
     LinePrinter line_printer_;
 
-    void SendQuit() {
-        SendRequest(ID_QUIT, ""); // TODO: add a SendResponse?
+    bool SendQuit() {
+        return SendRequest(ID_QUIT, ""); // TODO: add a SendResponse?
     }
 
     static uint64_t CurrentTimeMs() {