diff --git a/modules/net/dap_chain_node_cli_cmd.c b/modules/net/dap_chain_node_cli_cmd.c
index e5f48a323fffb0a65f0dc299780744aad5565606..1d1da233b0d2fb3880de97a3bd95b2aa885133d9 100644
--- a/modules/net/dap_chain_node_cli_cmd.c
+++ b/modules/net/dap_chain_node_cli_cmd.c
@@ -3536,10 +3536,6 @@ static int s_token_decl_check_params(int a_argc, char **a_argv, char **a_str_rep
                                               "%s support '-decimals' to be 18 only", a_update_token ? "token_update" : "token_decl");
             return -4;
         }
-        if(IS_ZERO_256(a_params->total_supply)) {
-            dap_cli_server_cmd_set_reply_text(a_str_reply, "%s requires parameter '-total_supply'", a_update_token ? "token_update" : "token_decl");
-            return -3;
-        }
     } else if (	a_params->subtype == DAP_CHAIN_DATUM_TOKEN_SUBTYPE_NATIVE){
         //// check l_decimals in CF20 token TODO: At the moment the checks are the same.
         if(!a_params->decimals_str) {
@@ -5236,27 +5232,22 @@ int com_tx_create(int a_argc, char **a_argv, char **a_str_reply)
         bool not_native = dap_strcmp(l_token_ticker, l_native_ticker);
 
         if (!l_wallet_fee_name) {
-            dap_cli_server_cmd_set_reply_text(a_str_reply, "tx_create requires parameter '-wallet_fee' to be a valid wallet name");
-            return -10;
-        }
-
-        l_wallet_fee = dap_chain_wallet_open(l_wallet_fee_name, c_wallets_path);
-        if((!l_wallet_fee)&&(not_native)) {
-            dap_cli_server_cmd_set_reply_text(a_str_reply, "wallet %s does not exist", l_wallet_fee_name);
-            return -11;
-        }
-
-        if(!l_wallet_fee){
-            if(!l_certs_str) {
-                dap_cli_server_cmd_set_reply_text(a_str_reply, "tx_create requires parameter '-certs'");
-                return -4;
+            l_wallet_fee = dap_chain_wallet_open(l_wallet_fee_name, c_wallets_path);
+            if((!l_wallet_fee)&&(not_native)) {
+                dap_cli_server_cmd_set_reply_text(a_str_reply, "wallet %s does not exist", l_wallet_fee_name);
+                return -11;
             }
+        }
+        else if (l_certs_str) {
             dap_cert_parse_str_list(l_certs_str, &l_certs, &l_certs_count);
             if(!l_certs_count) {
                 dap_cli_server_cmd_set_reply_text(a_str_reply,
                         "tx_create requires at least one valid certificate to sign the basic transaction of emission");
                 return -5;
             }
+        } else {
+            dap_cli_server_cmd_set_reply_text(a_str_reply, "tx_create requires parameter '-wallet_fee' to be a valid wallet name or '-certs'");
+            return -10;
         }
     }