diff --git a/src/chunk.c b/src/chunk.c
index 1f212452..7d04fc4d 100644
--- a/src/chunk.c
+++ b/src/chunk.c
@@ -741,7 +741,7 @@ static void chunkqueue_remove_empty_chunks(chunkqueue *cq) {
 	chunkqueue_remove_finished_chunks(cq);
 	if (chunkqueue_is_empty(cq)) return;
 
-	for (c = cq->first; c->next; c = c->next) {
+	for (c = cq->first; c && c->next; c = c->next) {
 		if (0 == chunk_remaining_length(c->next)) {
 			chunk *empty = c->next;
 			c->next = empty->next;