diff --git a/common/trace.c b/common/trace.c
index 48efd823a..4ea851310 100644
--- a/common/trace.c
+++ b/common/trace.c
@@ -264,6 +264,7 @@ void trace_span_start(const char *name, const void *key)
 
 	current = s;
 	DTRACE_PROBE1(lightningd, span_start, s->id);
+	trace_check_tree();
 }
 
 void trace_span_remote(u8 trace_id[TRACE_ID_SIZE], u8 span_id[SPAN_ID_SIZE])
@@ -283,6 +284,8 @@ void trace_span_end(const void *key)
 	DTRACE_PROBE1(lightningd, span_end, s->id);
 	trace_emit(s);
 
+	trace_check_tree();
+
 	/* Reset the context span we are in. */
 	current = s->parent;