diff --git a/control.c b/control.c
index 4a7201ef..ab461ff1 100644
--- a/control.c
+++ b/control.c
@@ -847,9 +847,9 @@ control_stop(struct client *c)
 	if (evtimer_initialized(&cs->subs_timer))
 		evtimer_del(&cs->subs_timer);
 
+	control_reset_offsets(c);
 	TAILQ_FOREACH_SAFE(cb, &cs->all_blocks, all_entry, cb1)
 		control_free_block(cs, cb);
-	control_reset_offsets(c);
 
 	c->control_state = NULL;
 	free(cs);