diff --git a/src/acpi/acpi.c b/src/acpi/acpi.c
index 6f64d10..05ada08 100644
--- a/src/acpi/acpi.c
+++ b/src/acpi/acpi.c
@@ -1473,7 +1473,8 @@
 
 		acpigen_set_current((char *) current);
 
-		acpi_fill_gnvs();
+		if (CONFIG(ACPI_SOC_NVS))
+			acpi_fill_gnvs();
 
 		for (dev = all_devices; dev; dev = dev->next)
 			if (dev->ops && dev->ops->acpi_inject_dsdt)