diff --git a/chronos/asyncfutures2.nim b/chronos/asyncfutures2.nim
index 625be00..231d497 100644
--- a/chronos/asyncfutures2.nim
+++ b/chronos/asyncfutures2.nim
@@ -804,6 +804,7 @@ proc cancelAndWait*[T](fut: Future[T]): Future[void] =
     retFuture.complete()
   else:
     fut.addCallback(continuation)
+    retFuture.cancelCallback = cancellation
     # Initiate cancellation process.
     fut.cancel()
   return retFuture