diff --git a/src/libstore/filetransfer.cc b/src/libstore/filetransfer.cc
index 72153dfdd..f8f5b48e0 100644
--- a/src/libstore/filetransfer.cc
+++ b/src/libstore/filetransfer.cc
@@ -603,6 +603,9 @@ struct curlFileTransfer : public FileTransfer
         void quit()
         {
             quitting = true;
+            /* We wil not be processing any more incomming requests */
+            while (!incoming.empty())
+                incoming.pop();
         }
 
         bool isQuitting()
@@ -787,8 +790,6 @@ struct curlFileTransfer : public FileTransfer
 
         {
             auto state(state_.lock());
-            while (!state->incoming.empty())
-                state->incoming.pop();
             state->quit();
         }
     }