diff --git a/Changelog b/Changelog
index eeb2e1d91..dd027bb85 100644
--- a/Changelog
+++ b/Changelog
@@ -1,6 +1,7 @@
 * Unreleased - Christophe Dumez <chris@qbittorrent.org> - v2.2.7
     - BUGFIX: Fix unicode problem in torrent moving code
     - BUGFIX: Fix possible initialization problem in Web UI
+    - BUGFIX: Fix torrent moving after completion feature
 
 * Sun Apr 18 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.2.6
     - BUGFIX: Announce to all trackers at once
diff --git a/src/bittorrent.cpp b/src/bittorrent.cpp
index 2bd4599b5..8a2782d74 100644
--- a/src/bittorrent.cpp
+++ b/src/bittorrent.cpp
@@ -1971,7 +1971,8 @@ void Bittorrent::addConsoleMessage(QString msg, QString) {
           qDebug("Torrent moved from %s to %s", qPrintable(old_save_path), qPrintable(new_save_path));
           qDebug("Attempting to remove %s", qPrintable(old_save_path));
           QDir().rmpath(old_save_path);
-          TorrentPersistentData::saveSavePath(h.hash(), new_save_path);
+          if(new_save_path != defaultTempPath)
+            TorrentPersistentData::saveSavePath(h.hash(), new_save_path);
           emit savePathChanged(h);
           //h.force_recheck();
         }