diff --git a/src/command_tracker.cc b/src/command_tracker.cc
index 30c56eec..cb34e8ba 100644
--- a/src/command_tracker.cc
+++ b/src/command_tracker.cc
@@ -159,6 +159,7 @@ initialize_command_tracker() {
   CMD2_ANY_VALUE      ("trackers.disable",    std::bind(&apply_enable_trackers, int64_t(0)));
   CMD2_VAR_VALUE      ("trackers.numwant",    -1);
   CMD2_VAR_BOOL       ("trackers.use_udp",    true);
+  CMD2_VAR_BOOL       {"trackers.delay_scrape", true);
 
   CMD2_ANY_STRING_V   ("dht.mode.set",          std::bind(&core::DhtManager::set_mode, control->dht_manager(), std::placeholders::_2));
   CMD2_VAR_VALUE      ("dht.port",              int64_t(6881));
diff --git a/src/core/download_factory.cc b/src/core/download_factory.cc
index 974870ef..7d0dab94 100644
--- a/src/core/download_factory.cc
+++ b/src/core/download_factory.cc
@@ -278,7 +278,7 @@ DownloadFactory::receive_success() {
     download->enable_udp_trackers(false);
 
   // Skip forcing trackers to scrape when rtorrent starts
-  if (m_initLoad)
+  if (m_initLoad && rpc::call_command_value("trackers.delay_scrape"))
     download->set_resume_flags(torrent::Download::start_skip_tracker);
 
   // Check first if we already have these values set in the session