diff --git a/src/ec/google/chromeec/acpi/ec.asl b/src/ec/google/chromeec/acpi/ec.asl
index 62f9acda4c..9ec5f7f3c5 100644
--- a/src/ec/google/chromeec/acpi/ec.asl
+++ b/src/ec/google/chromeec/acpi/ec.asl
@@ -21,7 +21,6 @@
 
 // Mainboard specific throttle handler
 External (\_TZ.THRT, MethodObj)
-External (\_SB.DPTF.TEVT, MethodObj)
 #ifdef DPTF_ENABLE_CHARGER
 External (\_SB.DPTF.TCHG, DeviceObj)
 #endif
@@ -481,9 +480,9 @@ Device (EC0)
 		/* When sensor ID returns 0xFF then no more events */
 		While (LNotEqual (Local0, EC_TEMP_SENSOR_NOT_PRESENT))
 		{
-			If (CondRefOf (\_SB.DPTF.TEVT)) {
-				\_SB.DPTF.TEVT (Local0)
-			}
+#ifdef HAVE_THERM_EVENT_HANDLER
+			\_SB.DPTF.TEVT (Local0)
+#endif
 
 			/* Keep reaading sensor ID for event */
 			Store (^PATI, Local0)
diff --git a/src/mainboard/google/cyan/variants/terra/include/variant/acpi/thermal.asl b/src/mainboard/google/cyan/variants/terra/include/variant/acpi/thermal.asl
index 6879076415..1ff308dd75 100644
--- a/src/mainboard/google/cyan/variants/terra/include/variant/acpi/thermal.asl
+++ b/src/mainboard/google/cyan/variants/terra/include/variant/acpi/thermal.asl
@@ -15,6 +15,7 @@
  */
 
 /* Thermal Threshold Event Handler */
+#define HAVE_THERM_EVENT_HANDLER
 Method (TEVT, 1, NotSerialized)
 {
 	Store (ToInteger (Arg0), Local0)
diff --git a/src/soc/intel/baytrail/acpi/dptf/thermal.asl b/src/soc/intel/baytrail/acpi/dptf/thermal.asl
index 00dc964895..d84ae4b040 100644
--- a/src/soc/intel/baytrail/acpi/dptf/thermal.asl
+++ b/src/soc/intel/baytrail/acpi/dptf/thermal.asl
@@ -13,6 +13,7 @@
  */
 
 /* Thermal Threshold Event Handler */
+#define HAVE_THERM_EVENT_HANDLER
 Method (TEVT, 1, NotSerialized)
 {
 	Store (ToInteger (Arg0), Local0)
diff --git a/src/soc/intel/braswell/acpi/dptf/thermal.asl b/src/soc/intel/braswell/acpi/dptf/thermal.asl
index 5d685bb96b..e104756b3e 100644
--- a/src/soc/intel/braswell/acpi/dptf/thermal.asl
+++ b/src/soc/intel/braswell/acpi/dptf/thermal.asl
@@ -13,6 +13,7 @@
  */
 
 /* Thermal Threshold Event Handler */
+#define HAVE_THERM_EVENT_HANDLER
 Method (TEVT, 1, NotSerialized)
 {
 	Store (ToInteger (Arg0), Local0)
diff --git a/src/soc/intel/common/acpi/dptf/thermal.asl b/src/soc/intel/common/acpi/dptf/thermal.asl
index ce220c4604..c8aa03749b 100644
--- a/src/soc/intel/common/acpi/dptf/thermal.asl
+++ b/src/soc/intel/common/acpi/dptf/thermal.asl
@@ -15,6 +15,7 @@
  */
 
 /* Thermal Threshold Event Handler */
+#define HAVE_THERM_EVENT_HANDLER
 Method (TEVT, 1, NotSerialized)
 {
 	Store (ToInteger (Arg0), Local0)
diff --git a/src/soc/intel/skylake/acpi/dptf/thermal.asl b/src/soc/intel/skylake/acpi/dptf/thermal.asl
index d84807b410..829039242c 100644
--- a/src/soc/intel/skylake/acpi/dptf/thermal.asl
+++ b/src/soc/intel/skylake/acpi/dptf/thermal.asl
@@ -15,6 +15,7 @@
  */
 
 /* Thermal Threshold Event Handler */
+#define HAVE_THERM_EVENT_HANDLER
 Method (TEVT, 1, NotSerialized)
 {