diff --git a/features/frameworks/mbed-client-cli/mbed_lib.json b/features/frameworks/mbed-client-cli/mbed_lib.json
index 02539ab516..17cdcf7656 100644
--- a/features/frameworks/mbed-client-cli/mbed_lib.json
+++ b/features/frameworks/mbed-client-cli/mbed_lib.json
@@ -42,7 +42,7 @@
       "value": null
     },
     "max_line_length": {
-      "help": "maximum input line length. Defaults to 200 when not set",
+      "help": "maximum input line length. Defaults to 2000 when not set",
       "value": null
     },
     "args_max_count": {
diff --git a/features/frameworks/mbed-client-cli/source/ns_cmdline.c b/features/frameworks/mbed-client-cli/source/ns_cmdline.c
index 396b5d70bf..7e113502b6 100644
--- a/features/frameworks/mbed-client-cli/source/ns_cmdline.c
+++ b/features/frameworks/mbed-client-cli/source/ns_cmdline.c
@@ -215,7 +215,7 @@
 #endif
 // Maximum length of input line
 #ifndef MBED_CONF_CMDLINE_MAX_LINE_LENGTH
-#define MBED_CONF_CMDLINE_MAX_LINE_LENGTH 200
+#define MBED_CONF_CMDLINE_MAX_LINE_LENGTH 2000
 #endif
 // Maximum number of arguments in a single command
 #ifndef MBED_CONF_CMDLINE_ARGS_MAX_COUNT