diff --git a/board/cr50/ec.tasklist b/board/cr50/ec.tasklist
index 3d2a4ab1ad..b22bc4e158 100644
--- a/board/cr50/ec.tasklist
+++ b/board/cr50/ec.tasklist
@@ -17,6 +17,6 @@
  * 's' is the stack size in bytes; must be a multiple of 8
  */
 #define CONFIG_TASK_LIST \
-	TASK_ALWAYS(HOOKS, hook_task, NULL, LARGER_TASK_STACK_SIZE) \
+	TASK_ALWAYS(HOOKS, hook_task, NULL, CONFIG_STACK_SIZE) \
 	TASK_NOTEST(TPM, tpm_task, NULL, 8192) \
 	TASK_ALWAYS(CONSOLE, console_task, NULL, TASK_STACK_SIZE)
diff --git a/common/tpm_registers.c b/common/tpm_registers.c
index ec424202c0..444ed52e20 100644
--- a/common/tpm_registers.c
+++ b/common/tpm_registers.c
@@ -533,6 +533,8 @@ static void tpm_init(void)
 	/* Create version string to be read by host */
 	set_version_string();
 
+	watchdog_reload();
+
 	/*
 	 * Make sure NV RAM metadata is initialized, needed to check
 	 * manufactured status. This is a speculative call which will have to