diff --git a/src/treepuncher/treepuncher.py b/src/treepuncher/treepuncher.py
index 3fd5d86..1f8f7e5 100644
--- a/src/treepuncher/treepuncher.py
+++ b/src/treepuncher/treepuncher.py
@@ -243,9 +243,9 @@ class Treepuncher(
 			await self.dispatcher.disconnect(block=not force)
 		if not force:
 			await self._worker
+			await self.join_callbacks()
 			for m in self.modules:
 				await m.cleanup()
-			await self.join_callbacks()
 		await super().stop()
 		self.logger.info("Treepuncher stopped")