diff --git a/artiq/tools.py b/artiq/tools.py
index 78bf3b819..2b5400a93 100644
--- a/artiq/tools.py
+++ b/artiq/tools.py
@@ -109,6 +109,7 @@ def asyncio_wait_or_cancel(fs, **kwargs):
         raise
     for f in p:
         f.cancel()
+        yield from asyncio.wait([f])
     return fs