diff --git a/util/cbfstool/cbfs_image.c b/util/cbfstool/cbfs_image.c
index b64f78e..e61664c 100644
--- a/util/cbfstool/cbfs_image.c
+++ b/util/cbfstool/cbfs_image.c
@@ -456,8 +456,10 @@
 	// Process buffer AFTER entry.
 	entry = cbfs_find_next_entry(image, entry);
 	addr = cbfs_get_entry_addr(image, entry);
-	assert(addr < addr_next);
+	if (addr == addr_next)
+		return 0;
 
+	assert(addr < addr_next);
 	if (addr_next - addr < min_entry_size) {
 		DEBUG("No space after content to keep CBFS structure.\n");
 		return -1;