diff --git a/electrum/daemon.py b/electrum/daemon.py
index 93b4baeb9..93a4f4dcc 100644
--- a/electrum/daemon.py
+++ b/electrum/daemon.py
@@ -32,6 +32,8 @@ import threading
 from typing import Dict, Optional, Tuple, Iterable
 from base64 import b64decode, b64encode
 from collections import defaultdict
+import concurrent
+from concurrent import futures
 
 import aiohttp
 from aiohttp import web, client_exceptions
@@ -507,7 +509,7 @@ class Daemon(Logger):
         fut = asyncio.run_coroutine_threadsafe(self.taskgroup.cancel_remaining(), self.asyncio_loop)
         try:
             fut.result(timeout=2)
-        except (asyncio.TimeoutError, asyncio.CancelledError):
+        except (concurrent.futures.TimeoutError, concurrent.futures.CancelledError, asyncio.CancelledError):
             pass
         self.logger.info("removing lockfile")
         remove_lockfile(get_lockfile(self.config))