diff --git a/src/core/bittorrent/torrenthandle.cpp b/src/core/bittorrent/torrenthandle.cpp
index 651859aeb..5d4e1f867 100644
--- a/src/core/bittorrent/torrenthandle.cpp
+++ b/src/core/bittorrent/torrenthandle.cpp
@@ -1691,6 +1691,14 @@ void TorrentHandle::removeExtensionsFromIncompleteFiles()
 }
 
 void TorrentHandle::adjustActualSavePath()
+{
+    if (!isMoveInProgress())
+        adjustActualSavePath_impl();
+    else
+        m_moveStorageTriggers.append(boost::bind(&TorrentHandle::adjustActualSavePath_impl, this));
+}
+
+void TorrentHandle::adjustActualSavePath_impl()
 {
     QString path;
     if (!useTempPath()) {
diff --git a/src/core/bittorrent/torrenthandle.h b/src/core/bittorrent/torrenthandle.h
index 541ce96c4..bbab9a73f 100644
--- a/src/core/bittorrent/torrenthandle.h
+++ b/src/core/bittorrent/torrenthandle.h
@@ -333,6 +333,7 @@ namespace BitTorrent
         void resolveCountries(bool b);
         void adjustSavePath();
         void adjustActualSavePath();
+        void adjustActualSavePath_impl();
         void moveStorage(const QString &newPath);
         void appendExtensionsToIncompleteFiles();
         void removeExtensionsFromIncompleteFiles();