diff --git a/src/GUI.cpp b/src/GUI.cpp
index e4ced5de8..782c210d5 100644
--- a/src/GUI.cpp
+++ b/src/GUI.cpp
@@ -1049,13 +1049,15 @@ void GUI::configureSession(bool deleteOptions) {
       int max_torrents = options->getMaxActiveTorrents();
       int max_downloads = options->getMaxActiveDownloads();
       sessionSettings.active_downloads = max_downloads;
-      sessionSettings.active_seeds = max_torrents;
+      sessionSettings.active_seeds = -1;
+      sessionSettings.active_limit = max_torrents;
       sessionSettings.dont_count_slow_torrents = false;
       BTSession->setQueueingEnabled(true);
   } else {
       if(BTSession->isQueueingEnabled()) {
           sessionSettings.active_downloads = -1;
           sessionSettings.active_seeds = -1;
+          sessionSettings.active_limit = -1;
           BTSession->setQueueingEnabled(false);
           downloadingTorrentTab->hidePriorityColumn(true);
       }