diff --git a/src/soc/amd/common/block/acpi/ivrs.c b/src/soc/amd/common/block/acpi/ivrs.c
index 089b42d01f..ca58c35d8e 100644
--- a/src/soc/amd/common/block/acpi/ivrs.c
+++ b/src/soc/amd/common/block/acpi/ivrs.c
@@ -310,6 +310,11 @@ unsigned long acpi_fill_ivrs(acpi_ivrs_t *ivrs, unsigned long current)
 	struct device *nb_dev;
 	struct device *dev = NULL;
 
+	if (ivrs == NULL) {
+		printk(BIOS_WARNING, "%s: ivrs is NULL\n", __func__);
+		return current;
+	}
+
 	ivhd = &ivrs->ivhd;
 
 	while ((dev = dev_find_path(dev, DEVICE_PATH_DOMAIN)) != NULL) {