diff --git a/src/calibre/gui2/ui.py b/src/calibre/gui2/ui.py
index d11e8bf700..a0b90fe8cb 100644
--- a/src/calibre/gui2/ui.py
+++ b/src/calibre/gui2/ui.py
@@ -1183,10 +1183,13 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin,  # {{{
         self.hide_windows()
         if self._spare_pool is not None:
             self._spare_pool.shutdown()
+        from calibre.scraper.simple import cleanup_overseers
+        wait_for_cleanup = cleanup_overseers()
         from calibre.db.delete_service import shutdown
         shutdown()
         time.sleep(2)
         self.istores.join()
+        wait_for_cleanup()
         return True
 
     def run_wizard(self, *args):