diff --git a/locales/en/messages.json b/locales/en/messages.json
index f9061651e4..47077d6f11 100755
--- a/locales/en/messages.json
+++ b/locales/en/messages.json
@@ -3391,6 +3391,9 @@
     "cliEnter": {
         "message": "CLI mode detected"
     },
+    "cliDevEnter": {
+        "message": "CLI only developer mode detected"
+    },
     "cliReboot": {
         "message": "CLI reboot detected"
     },
diff --git a/src/js/tabs/cli.js b/src/js/tabs/cli.js
index b212875163..e7f2a8955e 100644
--- a/src/js/tabs/cli.js
+++ b/src/js/tabs/cli.js
@@ -12,6 +12,7 @@ import { serial } from "../serial";
 import FileSystem from "../FileSystem";
 import { ispConnected } from "../utils/connection";
 import { initializeModalDialog } from "../utils/initializeModalDialog";
+import { get as getConfig } from "../ConfigStorage";
 
 const cli = {
     lineDelayMs: 5,
@@ -477,7 +478,7 @@ cli.read = function (readInfo) {
     this.lastArrival = new Date().getTime();
 
     if (!CONFIGURATOR.cliValid && validateText.indexOf("CLI") !== -1) {
-        gui_log(i18n.getMessage("cliEnter"));
+        gui_log(i18n.getMessage(getConfig("cliOnlyMode")?.cliOnlyMode ? "cliDevEnter" : "cliEnter"));
         CONFIGURATOR.cliValid = true;
         // begin output history with the prompt (last line of welcome message)
         // this is to match the content of the history with what the user sees on this tab