diff --git a/build_kernel_image.sh b/build_kernel_image.sh
index 872ba39ff0..5ee3e305a3 100755
--- a/build_kernel_image.sh
+++ b/build_kernel_image.sh
@@ -167,6 +167,7 @@ cros_secure
 kern_guid=%U
 tpm_tis.force=1
 tpm_tis.interrupts=0
+nmi_watchdog=panic,lapic
 EOF
   WORK="${WORK} ${FLAGS_working_dir}/config.txt"