diff --git a/net/server/cli_server/dap_cli_server.c b/net/server/cli_server/dap_cli_server.c
index f03e9cdaa1982d2b0ba07e3921645faceb08c132..7a42efeab3f9aae55a6f8d38540011719cea4e24 100644
--- a/net/server/cli_server/dap_cli_server.c
+++ b/net/server/cli_server/dap_cli_server.c
@@ -454,6 +454,8 @@ char *dap_cli_cmd_exec(char *a_req_str) {
     dap_json_rpc_params_t * params = request->params;
 
     char *str_cmd = dap_json_rpc_params_get(params, 0);
+    if (!str_cmd)
+        str_cmd = cmd_name;
     int res = -1;
     char *str_reply = NULL;
     json_object* l_json_arr_reply = json_object_new_array();