diff --git a/Changelog b/Changelog
index d1e7bfb6b..934cddf6a 100644
--- a/Changelog
+++ b/Changelog
@@ -2,6 +2,7 @@
     - BUGFIX: Fix possible crash on manual peer ban
     - BUGFIX: Improved hostname resolution code
     - BUGFIX: Several search plugins fixed
+    - BUGFIX: Auto-disable the shutdown feature
 
 * Tue Oct 19 2010  - Christophe Dumez <chris@qbittorrent.org> - v2.4.7
     - BUGFIX: Display the priority column when the queueing system gets enabled
diff --git a/src/bittorrent.cpp b/src/bittorrent.cpp
index 753f87960..9dea1d641 100644
--- a/src/bittorrent.cpp
+++ b/src/bittorrent.cpp
@@ -2081,6 +2081,8 @@ void Bittorrent::addConsoleMessage(QString msg, QString) {
             // Auto-Shutdown
             if(will_shutdown) {
               qDebug("Preparing for auto-shutdown because all downloads are complete!");
+              // Disabling it for next time
+              Preferences::setShutdownWhenDownloadsComplete(false);
 #if LIBTORRENT_VERSION_MINOR < 15
               saveDHTEntry();
 #endif