diff --git a/src/barebox-state/backend_bucket_circular.c b/src/barebox-state/backend_bucket_circular.c
index ec16df2..dd609aa 100644
--- a/src/barebox-state/backend_bucket_circular.c
+++ b/src/barebox-state/backend_bucket_circular.c
@@ -280,7 +280,10 @@
 	}
 
 	*buf_out = buf;
-	*len_out = read_len - sizeof(struct state_backend_storage_bucket_circular_meta);
+	/* When reading old state there is no circular bucket metadata */
+	if (circ->last_written_length)
+		read_len -= sizeof(struct state_backend_storage_bucket_circular_meta);
+	*len_out = read_len;
 
 	return ret;
 }