diff --git a/modules/net/dap_chain_node_cli.c b/modules/net/dap_chain_node_cli.c
index 7174f34d2011c8a50d5b433c00c4797454a7aaa2..1bd79d30d76aa72b179ef8a6b02b18b15063d0c0 100644
--- a/modules/net/dap_chain_node_cli.c
+++ b/modules/net/dap_chain_node_cli.c
@@ -278,7 +278,8 @@ int dap_chain_node_cli_init(dap_config_t * g_config)
 
     // Transaction history
     dap_cli_server_cmd_add("tx_history", com_tx_history, "Transaction history (for address or by hash)",
-            "tx_history  {-addr <addr> | -w <wallet_name> | -tx <tx_hash>} [-net <net_name>] [-chain <chain_name>]\n");
+            "tx_history  {-addr <addr> | -w <wallet_name> | -tx <tx_hash>} [-net <net_name>] [-chain <chain_name>]\n"
+            "tx_history -all -net <net_name> [-chain <chain_name>]\n");
 
 	// Ledger info
     dap_cli_server_cmd_add("ledger", com_ledger, "Ledger information",
diff --git a/modules/net/dap_chain_node_cli_cmd.c b/modules/net/dap_chain_node_cli_cmd.c
index 17a0469ec531d8658a91f875e51d1dbd4a717038..18628beab9196096925ed024e7e0b0447fe2a235 100644
--- a/modules/net/dap_chain_node_cli_cmd.c
+++ b/modules/net/dap_chain_node_cli_cmd.c
@@ -5319,6 +5319,11 @@ int com_tx_history(int a_argc, char ** a_argv, char **a_str_reply)
         }
     }
     // Select chain, if any
+    if (!l_net) {
+        dap_cli_server_cmd_set_reply_text(a_str_reply, "Could not determine the network from which to "
+                                                       "extract data for the tx_history command to work.");
+        return -9;
+    }
     if (l_chain_str)
         l_chain = dap_chain_net_get_chain_by_name(l_net, l_chain_str);
     else