diff --git a/src/gui/qt-daemon/layout b/src/gui/qt-daemon/layout
index 22212b20..14def6ae 160000
--- a/src/gui/qt-daemon/layout
+++ b/src/gui/qt-daemon/layout
@@ -1 +1 @@
-Subproject commit 22212b20250b918f713dc90e85dadc2700d23a6a
+Subproject commit 14def6aef99d4f10e81990e2055a7cf490f2e797
diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp
index 7f4ab1b0..a11e9cfb 100644
--- a/src/simplewallet/simplewallet.cpp
+++ b/src/simplewallet/simplewallet.cpp
@@ -56,7 +56,7 @@ namespace
   const command_line::arg_descriptor<bool> arg_offline_mode  ( "offline-mode", "Don't connect to daemon, work offline (for cold-signing process)");
   const command_line::arg_descriptor<std::string> arg_scan_for_wallet  ( "scan-for-wallet", "");
   const command_line::arg_descriptor<std::string> arg_addr_to_compare  ( "addr-to-compare", "");
-  const command_line::arg_descriptor<bool> arg_disable_tor_relay  ( "disable-tor-relay", "Do PoS mining", false);
+  const command_line::arg_descriptor<bool> arg_disable_tor_relay  ( "disable-tor-relay", "Disable TOR relay", false);
 
   const command_line::arg_descriptor< std::vector<std::string> > arg_command  ("command", "");
 
@@ -2176,6 +2176,17 @@ int main(int argc, char* argv[])
         LOG_PRINT_YELLOW("PoS reward will be sent to another address: " << arg_pos_mining_reward_address_str, LOG_LEVEL_0);
       }
     }
+    
+    if (command_line::has_arg(vm, arg_disable_tor_relay))
+    {
+      wal.set_disable_tor_relay(command_line::get_arg(vm, arg_disable_tor_relay));
+    }
+    else
+    {
+      //disable TOR by default for server-mode, to avoid potential sporadic errors due to TOR connectivity fails
+      wal.set_disable_tor_relay(true);
+    }
+    
 
     tools::wallet_rpc_server wrpc(wal);
     bool r = wrpc.init(vm);
diff --git a/src/wallet/wallet_rpc_server.cpp b/src/wallet/wallet_rpc_server.cpp
index 7f352048..d49148e4 100644
--- a/src/wallet/wallet_rpc_server.cpp
+++ b/src/wallet/wallet_rpc_server.cpp
@@ -143,6 +143,7 @@ namespace tools
     {
       m_wallet.set_miner_text_info(command_line::get_arg(vm, arg_miner_text_info));
     }
+
     return true;
   }
   //------------------------------------------------------------------------------------------------------------------------------