diff --git a/src/daemon/daemon.cpp b/src/daemon/daemon.cpp
index 318b5241c..07ece8b42 100644
--- a/src/daemon/daemon.cpp
+++ b/src/daemon/daemon.cpp
@@ -158,7 +158,10 @@ int main(int argc, char* argv[])
   if (command_line::arg_present(vm, arg_command))
   {
     auto command = command_line::get_arg(vm, arg_command);
-    auto args = t_rpc_command_executor::parse_host("127.0.0.1", "18081");
+    auto rpc_ip_str = command_line::get_arg(vm, cryptonote::core_rpc_server::arg_rpc_bind_ip);
+    auto rpc_port_str = command_line::get_arg(vm, cryptonote::core_rpc_server::arg_rpc_bind_port);
+
+    auto args = t_rpc_command_executor::parse_host(rpc_ip_str, rpc_port_str);
     if (!args.ok)
     {
       std::cerr << "Invalid RPC host" << std::endl;
diff --git a/src/rpc/core_rpc_server.cpp b/src/rpc/core_rpc_server.cpp
index c3f98563d..a19ab8d57 100644
--- a/src/rpc/core_rpc_server.cpp
+++ b/src/rpc/core_rpc_server.cpp
@@ -17,11 +17,8 @@ using namespace epee;
 
 namespace cryptonote
 {
-  namespace
-  {
-    const command_line::arg_descriptor<std::string> arg_rpc_bind_ip   = {"rpc-bind-ip", "", "127.0.0.1"};
-    const command_line::arg_descriptor<std::string> arg_rpc_bind_port = {"rpc-bind-port", "", std::to_string(RPC_DEFAULT_PORT)};
-  }
+  const command_line::arg_descriptor<std::string> core_rpc_server::arg_rpc_bind_ip   = {"rpc-bind-ip", "", "127.0.0.1"};
+  const command_line::arg_descriptor<std::string> core_rpc_server::arg_rpc_bind_port = {"rpc-bind-port", "", std::to_string(RPC_DEFAULT_PORT)};
 
   //-----------------------------------------------------------------------------------
   void core_rpc_server::init_options(boost::program_options::options_description& desc)
@@ -30,7 +27,11 @@ namespace cryptonote
     command_line::add_arg(desc, arg_rpc_bind_port);
   }
   //------------------------------------------------------------------------------------------------------------------------------
-  core_rpc_server::core_rpc_server(core& cr, nodetool::node_server<cryptonote::t_cryptonote_protocol_handler<cryptonote::core> >& p2p):m_core(cr), m_p2p(p2p)
+  core_rpc_server::core_rpc_server(
+      core& cr, nodetool::node_server<cryptonote::t_cryptonote_protocol_handler<cryptonote::core> >& p2p
+    ) :
+      m_core(cr)
+    , m_p2p(p2p)
   {}
   //------------------------------------------------------------------------------------------------------------------------------
   bool core_rpc_server::handle_command_line(const boost::program_options::variables_map& vm)
diff --git a/src/rpc/core_rpc_server.h b/src/rpc/core_rpc_server.h
index abd9e3de7..82b82cd2a 100644
--- a/src/rpc/core_rpc_server.h
+++ b/src/rpc/core_rpc_server.h
@@ -23,6 +23,9 @@ namespace cryptonote
   public:
     typedef epee::net_utils::connection_context_base connection_context;
 
+    static const command_line::arg_descriptor<std::string> arg_rpc_bind_ip;
+    static const command_line::arg_descriptor<std::string> arg_rpc_bind_port;
+
     core_rpc_server(core& cr, nodetool::node_server<cryptonote::t_cryptonote_protocol_handler<cryptonote::core> >& p2p);
 
     static void init_options(boost::program_options::options_description& desc);