diff --git a/common/setup.c b/common/setup.c
index 1b8357c74..55281f458 100644
--- a/common/setup.c
+++ b/common/setup.c
@@ -44,6 +44,10 @@ void common_setup(const char *argv0)
 
 void common_shutdown(void)
 {
+	const char *p = taken_any();
+	if (p)
+		errx(1, "outstanding taken(): %s", p);
+	take_cleanup();
 	tal_free(tmpctx);
 	wally_cleanup(0);
 	tal_free(wally_tal_ctx);