diff --git a/src/command_tracker.cc b/src/command_tracker.cc
index 1c5ec9ae..f61b47fe 100644
--- a/src/command_tracker.cc
+++ b/src/command_tracker.cc
@@ -128,7 +128,7 @@ initialize_command_tracker() {
   CMD2_VAR_BOOL       ("trackers.delay_scrape", false);
   CMD2_VAR_VALUE      ("trackers.numwant",    -1);
 
-  CMD2_ANY            ("trackers.use_udp",     [](auto, auto) { return false; });
+  CMD2_ANY            ("trackers.use_udp",     [](auto, auto) { return true; });
   CMD2_ANY_VALUE_V    ("trackers.use_udp.set", [](auto, auto) {
       lt_log_print(torrent::LOG_ERROR, "trackers.use_udp.set is no longer supported", 0);
     })
diff --git a/src/core/download.cc b/src/core/download.cc
index 08cd5d28..ff166764 100644
--- a/src/core/download.cc
+++ b/src/core/download.cc
@@ -32,21 +32,6 @@ Download::~Download() {
   m_download = download_type();
 }
 
-void
-Download::enable_udp_trackers(bool state) {
-  for (int idx = 0, end = m_download.tracker_controller().size(); idx < end; ++idx) {
-    auto tracker = m_download.tracker_controller().at(idx);
-
-    if (tracker.type() != torrent::TRACKER_UDP)
-      continue;
-
-    if (state)
-      tracker.enable();
-    else
-      tracker.disable();
-  }
-}
-
 uint32_t
 Download::priority() {
   return bencode()->get_key("rtorrent").get_key_value("priority");
diff --git a/src/core/download.h b/src/core/download.h
index d9da7257..6c0965a8 100644
--- a/src/core/download.h
+++ b/src/core/download.h
@@ -70,8 +70,6 @@ public:
   const std::string&  message() const                          { return m_message; }
   void                set_message(const std::string& msg)      { m_message = msg; }
 
-  void                enable_udp_trackers(bool state);
-
   uint32_t            priority();
   void                set_priority(uint32_t p);
 
diff --git a/src/core/download_factory.cc b/src/core/download_factory.cc
index ff07bce8..589db4b1 100644
--- a/src/core/download_factory.cc
+++ b/src/core/download_factory.cc
@@ -238,9 +238,6 @@ DownloadFactory::receive_success() {
       rpc::call_command("d.peers_max.set", rpc::call_command("throttle.max_peers.seed"), rpc::make_target(download));
   }
 
-  if (!rpc::call_command_value("trackers.use_udp"))
-    download->enable_udp_trackers(false);
-
   // Skip forcing trackers to scrape when rtorrent starts
   if (m_initLoad && rpc::call_command_value("trackers.delay_scrape"))
     download->set_resume_flags(torrent::Download::start_skip_tracker);