diff --git a/iiod/responder.c b/iiod/responder.c
index f4af579ac..d9d8d8c7c 100644
--- a/iiod/responder.c
+++ b/iiod/responder.c
@@ -47,6 +47,8 @@ static void free_buffer_entry(struct buffer_entry *entry)
 {
 	struct block_entry *block_entry, *block_next;
 
+	iio_buffer_cancel(entry->buf);
+
 	if (!NO_THREADS) {
 		iio_task_stop(entry->dequeue_task);
 		iio_task_stop(entry->enqueue_task);