diff --git a/src/mainboard/google/skyrim/Kconfig b/src/mainboard/google/skyrim/Kconfig
index 4e9ae98..59f6c67 100644
--- a/src/mainboard/google/skyrim/Kconfig
+++ b/src/mainboard/google/skyrim/Kconfig
@@ -247,9 +247,4 @@
 config SPI_FLASH_WINBOND
 	default y
 
-# Enable hibernate on TPM setup error as needed
-config TPM_SETUP_HIBERNATE_ON_ERR
-	bool
-	default y
-
 endif # BOARD_GOOGLE_BASEBOARD_SKYRIM
diff --git a/src/security/tpm/Kconfig b/src/security/tpm/Kconfig
index c06150d..e129f51 100644
--- a/src/security/tpm/Kconfig
+++ b/src/security/tpm/Kconfig
@@ -176,6 +176,7 @@
 config TPM_SETUP_HIBERNATE_ON_ERR
 	bool
 	depends on EC_GOOGLE_CHROMEEC
+	default y
 	help
 	  Select this to force a device to hibernate on the next AP shutdown when a TPM
 	  setup error occurs. This will cause a cold boot of the system and offer an