diff --git a/payloads/libpayload/libcbfs/cbfs_core.c b/payloads/libpayload/libcbfs/cbfs_core.c
index ff3c527f46..14a2001855 100644
--- a/payloads/libpayload/libcbfs/cbfs_core.c
+++ b/payloads/libpayload/libcbfs/cbfs_core.c
@@ -100,7 +100,8 @@ static int get_cbfs_range(uint32_t *offset, uint32_t *cbfs_end,
 {
 	const struct cbfs_header *header;
 
-	if (lib_sysinfo.cbfs_offset && lib_sysinfo.cbfs_size) {
+	if (media == CBFS_DEFAULT_MEDIA &&
+		lib_sysinfo.cbfs_offset && lib_sysinfo.cbfs_size) {
 		*offset = lib_sysinfo.cbfs_offset;
 		*cbfs_end = *offset + lib_sysinfo.cbfs_size;
 		return 0;