diff --git a/applications/tari_miner/src/config.rs b/applications/tari_miner/src/config.rs
index 2407129153..55554bfa44 100644
--- a/applications/tari_miner/src/config.rs
+++ b/applications/tari_miner/src/config.rs
@@ -75,6 +75,8 @@ pub struct MinerConfig {
     pub coinbase_extra: String,
     /// Selected network
     pub network: Network,
+    /// Base node reconnect timeout after any GRPC or miner error
+    pub wait_timeout_on_error: u64,
 }
 
 #[derive(Serialize, Deserialize, Debug, Default)]
@@ -104,6 +106,7 @@ impl Default for MinerConfig {
             mining_worker_name: String::new(),
             coinbase_extra: "tari_miner".to_string(),
             network: Default::default(),
+            wait_timeout_on_error: 10,
         }
     }
 }
@@ -119,8 +122,7 @@ impl MinerConfig {
     }
 
     pub fn wait_timeout(&self) -> Duration {
-        // TODO: add config parameter
-        Duration::from_secs(10)
+        Duration::from_secs(self.wait_timeout_on_error)
     }
 
     pub fn validate_tip_interval(&self) -> Duration {
diff --git a/common/config/presets/g_miner.toml b/common/config/presets/g_miner.toml
index 31e649f54e..717a9da1d7 100644
--- a/common/config/presets/g_miner.toml
+++ b/common/config/presets/g_miner.toml
@@ -34,3 +34,6 @@
 
 # Stratum Mode configuration - mining worker name (e.g. "worker1")
 # mining_worker_name = "worker1"
+
+# Base node reconnect timeout after any GRPC or miner error (default: 10 s)
+# wait_timeout_on_error = 10
diff --git a/common/config/presets/j_dan_wallet_daemon.toml b/common/config/presets/j_dan_wallet_daemon.toml
index 70b19d61a5..66c1d8aefc 100644
--- a/common/config/presets/j_dan_wallet_daemon.toml
+++ b/common/config/presets/j_dan_wallet_daemon.toml
@@ -1,3 +1,10 @@
+
+########################################################################################################################
+#                                                                                                                      #
+#                                     DAN Wallet Daemon Configuration Options ()                                       #
+#                                                                                                                      #
+########################################################################################################################
+
 [dan_wallet_daemon]
 # JSON-RPC listener address (default = "127.0.0.1:9000")
 # listen_addr = "127.0.0.1:9000"