diff --git a/src/arch/x86/boot/acpi.c b/src/arch/x86/boot/acpi.c
index ea656664d9..b9fbc8162e 100644
--- a/src/arch/x86/boot/acpi.c
+++ b/src/arch/x86/boot/acpi.c
@@ -749,9 +749,11 @@ unsigned long write_acpi_tables(unsigned long start)
 	printk(BIOS_DEBUG, "ACPI:     * SSDT\n");
 	ssdt = (acpi_header_t *)current;
 	acpi_create_ssdt_generator(ssdt, ACPI_TABLE_CREATOR);
-	current += ssdt->length;
-	acpi_add_table(rsdp, ssdt);
-	ALIGN_CURRENT;
+	if (ssdt->length > sizeof(acpi_header_t)) {
+		current += ssdt->length;
+		acpi_add_table(rsdp, ssdt);
+		ALIGN_CURRENT;
+	}
 
 	printk(BIOS_DEBUG, "ACPI:    * MCFG\n");
 	mcfg = (acpi_mcfg_t *) current;