diff --git a/lib/uuid-console/src/shell.cpp b/lib/uuid-console/src/shell.cpp
index 771806065..94b27887d 100644
--- a/lib/uuid-console/src/shell.cpp
+++ b/lib/uuid-console/src/shell.cpp
@@ -85,7 +85,11 @@ void Shell::stop() {
 
         blocking_data->stop_ = true;
     } else {
+#if defined(EMSESP_STANDALONE)
+        if (running()) {
+#else
         if (running() && !has_flags(CommandFlags::LOCAL)) { // do not close local shell
+#endif
             stopped_ = true;
             stopped();
         }