diff --git a/src/acpi/acpi.c b/src/acpi/acpi.c
index f6a36f8..c567299 100644
--- a/src/acpi/acpi.c
+++ b/src/acpi/acpi.c
@@ -282,7 +282,8 @@
 	if (CONFIG(ACPI_HAVE_PCAT_8259))
 		madt->flags |= 1;
 
-	current = acpi_fill_madt(current);
+	if (!CONFIG(ACPI_NO_MADT))
+		current = acpi_fill_madt(current);
 
 	/* (Re)calculate length and checksum. */
 	header->length = current - (unsigned long)madt;