diff --git a/br-ext-chip-grainmedia/board/gm8136/kernel/gm8135.generic.config b/br-ext-chip-grainmedia/board/gm8136/kernel/gm8135.generic.config
index 2e38791c..1e11cd2a 100644
--- a/br-ext-chip-grainmedia/board/gm8136/kernel/gm8135.generic.config
+++ b/br-ext-chip-grainmedia/board/gm8136/kernel/gm8135.generic.config
@@ -1085,7 +1085,7 @@ CONFIG_GPIO_FTGPIO010=y
 # CONFIG_THERMAL is not set
 CONFIG_WATCHDOG=y
 # CONFIG_WATCHDOG_CORE is not set
-# CONFIG_WATCHDOG_NOWAYOUT is not set
+CONFIG_WATCHDOG_NOWAYOUT=y
 
 #
 # Watchdog Device Drivers
diff --git a/br-ext-chip-grainmedia/board/gm8136/kernel/gm8136.generic.config b/br-ext-chip-grainmedia/board/gm8136/kernel/gm8136.generic.config
index 2e38791c..1e11cd2a 100644
--- a/br-ext-chip-grainmedia/board/gm8136/kernel/gm8136.generic.config
+++ b/br-ext-chip-grainmedia/board/gm8136/kernel/gm8136.generic.config
@@ -1085,7 +1085,7 @@ CONFIG_GPIO_FTGPIO010=y
 # CONFIG_THERMAL is not set
 CONFIG_WATCHDOG=y
 # CONFIG_WATCHDOG_CORE is not set
-# CONFIG_WATCHDOG_NOWAYOUT is not set
+CONFIG_WATCHDOG_NOWAYOUT=y
 
 #
 # Watchdog Device Drivers