diff --git a/src/core/qtlibtorrent/qbtsession.cpp b/src/core/qtlibtorrent/qbtsession.cpp
index 68d45fb94..06cf65044 100644
--- a/src/core/qtlibtorrent/qbtsession.cpp
+++ b/src/core/qtlibtorrent/qbtsession.cpp
@@ -450,23 +450,17 @@ void QBtSession::configureSession() {
     if (pref->isQueueingSystemEnabled()) {
         int max_downloading = pref->getMaxActiveDownloads();
         int max_active = pref->getMaxActiveTorrents();
+
         if (max_downloading > -1)
             sessionSettings.active_downloads = max_downloading + HiddenData::getDownloadingSize();
         else
             sessionSettings.active_downloads = max_downloading;
-        if (max_active > -1) {
-            int limit = max_active + HiddenData::getDownloadingSize();
-            sessionSettings.active_limit = limit;
-            sessionSettings.active_tracker_limit = limit;
-            sessionSettings.active_dht_limit = limit;
-            sessionSettings.active_lsd_limit = limit;
-        }
-        else {
+
+        if (max_active > -1)
+            sessionSettings.active_limit = max_active + HiddenData::getDownloadingSize();
+        else
             sessionSettings.active_limit = max_active;
-            sessionSettings.active_tracker_limit = max_active;
-            sessionSettings.active_dht_limit = max_active;
-            sessionSettings.active_lsd_limit = max_active;
-        }
+
         sessionSettings.active_seeds = pref->getMaxActiveUploads();
         sessionSettings.dont_count_slow_torrents = pref->ignoreSlowTorrentsForQueueing();
         setQueueingEnabled(true);
@@ -474,11 +468,11 @@ void QBtSession::configureSession() {
         sessionSettings.active_downloads = -1;
         sessionSettings.active_seeds = -1;
         sessionSettings.active_limit = -1;
-        sessionSettings.active_tracker_limit = -1;
-        sessionSettings.active_dht_limit = -1;
-        sessionSettings.active_lsd_limit = -1;
         setQueueingEnabled(false);
     }
+    sessionSettings.active_tracker_limit = -1;
+    sessionSettings.active_dht_limit = -1;
+    sessionSettings.active_lsd_limit = -1;
     // Outgoing ports
     sessionSettings.outgoing_ports = std::make_pair(pref->outgoingPortsMin(), pref->outgoingPortsMax());
     // Ignore limits on LAN