diff --git a/src/base/bittorrent/sessionimpl.cpp b/src/base/bittorrent/sessionimpl.cpp
index 708258e93885..5287f6425fb6 100644
--- a/src/base/bittorrent/sessionimpl.cpp
+++ b/src/base/bittorrent/sessionimpl.cpp
@@ -683,16 +683,25 @@ SessionImpl::SessionImpl(QObject *parent)
     // start embedded tracker
     enableTracker(isTrackerEnabled());
 
-    prepareStartup();
-
     m_updateTrackersFromURLTimer = new QTimer(this);
     m_updateTrackersFromURLTimer->setInterval(24h);
-    connect(m_updateTrackersFromURLTimer, &QTimer::timeout, this, &SessionImpl::updateTrackersFromURL);
-    if (isAddTrackersFromURLEnabled())
+    connect(m_updateTrackersFromURLTimer, &QTimer::timeout, this, [this]()
     {
         updateTrackersFromURL();
+    });
+
+    if (isAddTrackersFromURLEnabled())
+    {
+        updateTrackersFromURL([this]()
+        {
+            prepareStartup();
+        });
         m_updateTrackersFromURLTimer->start();
     }
+    else
+    {
+        prepareStartup();
+    }
 }
 
 SessionImpl::~SessionImpl()
@@ -4024,26 +4033,32 @@ void SessionImpl::setAdditionalTrackersFromURL(const QString &trackers)
     }
 }
 
-void SessionImpl::updateTrackersFromURL()
+void SessionImpl::updateTrackersFromURL(const std::function<void()> &onFinished)
 {
     const QString url = additionalTrackersURL();
     if (url.isEmpty())
     {
         setAdditionalTrackersFromURL({});
+        if (onFinished)
+            onFinished();
     }
     else
     {
         Net::DownloadManager::instance()->download(Net::DownloadRequest(url)
-                , Preferences::instance()->useProxyForGeneralPurposes(), this, [this](const Net::DownloadResult &result)
+                , Preferences::instance()->useProxyForGeneralPurposes(), this, [this, onFinished](const Net::DownloadResult &result)
         {
             if (result.status == Net::DownloadStatus::Success)
             {
                 setAdditionalTrackersFromURL(QString::fromUtf8(result.data));
                 LogMsg(tr("Tracker list updated"), Log::INFO);
+                if (onFinished)
+                    onFinished();
                 return;
             }
 
             LogMsg(tr("Failed to update tracker list. Reason: \"%1\"").arg(result.errorString), Log::WARNING);
+            if (onFinished)
+                onFinished();
         });
     }
 }
diff --git a/src/base/bittorrent/sessionimpl.h b/src/base/bittorrent/sessionimpl.h
index bd2c836cab65..2ca3066d08b0 100644
--- a/src/base/bittorrent/sessionimpl.h
+++ b/src/base/bittorrent/sessionimpl.h
@@ -647,7 +647,7 @@ namespace BitTorrent
         void handleRemovedTorrent(const TorrentID &torrentID, const QString &partfileRemoveError = {});
 
         void setAdditionalTrackersFromURL(const QString &trackers);
-        void updateTrackersFromURL();
+        void updateTrackersFromURL(const std::function<void()> &onFinished = {});
 
         CachedSettingValue<QString> m_DHTBootstrapNodes;
         CachedSettingValue<bool> m_isDHTEnabled;