diff --git a/src/console.cpp b/src/console.cpp
index 0878ca24f..506169852 100644
--- a/src/console.cpp
+++ b/src/console.cpp
@@ -88,9 +88,13 @@ void EMSESPShell::display_banner() {
     // load the list of commands
     add_console_commands();
 
-    // turn off watch
+    // turn off watch, unless is test mode
     emsesp::EMSESP::watch_id(WATCH_ID_NONE);
+#if defined(EMSESP_STANDALONE)
+    emsesp::EMSESP::watch(EMSESP::WATCH_ON);
+#else
     emsesp::EMSESP::watch(EMSESP::WATCH_OFF);
+#endif
 }
 
 // pre-loads all the console commands into the MAIN context
@@ -558,7 +562,7 @@ void Console::start() {
 #endif
 
     // turn watch off in case it was still set in the last session
-    emsesp::EMSESP::watch(EMSESP::WATCH_OFF);
+    // emsesp::EMSESP::watch(EMSESP::WATCH_OFF);
 }
 
 // handles telnet sync and logging to console