diff --git a/lib/blob/blobstore.c b/lib/blob/blobstore.c
index 673e45948..293096422 100644
--- a/lib/blob/blobstore.c
+++ b/lib/blob/blobstore.c
@@ -249,8 +249,11 @@ _spdk_blob_parse_page(const struct spdk_blob_md_page *page, struct spdk_blob *bl
 		}
 
 		/* Advance to the next descriptor */
-		desc = (struct spdk_blob_md_descriptor *)((uintptr_t)desc + sizeof(*desc) + desc->length);
 		cur_desc += sizeof(*desc) + desc->length;
+		if (cur_desc + sizeof(*desc) > sizeof(page->descriptors)) {
+			break;
+		}
+		desc = (struct spdk_blob_md_descriptor *)((uintptr_t)page->descriptors + cur_desc);
 	}
 }
 
diff --git a/lib/blob/blobstore.h b/lib/blob/blobstore.h
index fdc2baffd..1977a483a 100644
--- a/lib/blob/blobstore.h
+++ b/lib/blob/blobstore.h
@@ -217,7 +217,7 @@ struct spdk_blob_md_page {
 	uint32_t	reserved0;
 
 	/* Descriptors here */
-	uint64_t	descriptors[509];
+	uint8_t		descriptors[4072];
 
 	uint32_t	next;
 	uint32_t	crc;