diff --git a/src/base/bittorrent/torrenthandle.cpp b/src/base/bittorrent/torrenthandle.cpp
index 5a2255bf0..976afd0a9 100644
--- a/src/base/bittorrent/torrenthandle.cpp
+++ b/src/base/bittorrent/torrenthandle.cpp
@@ -1358,6 +1358,10 @@ void TorrentHandle::handleStorageMovedAlert(libtorrent::storage_moved_alert *p)
     }
 
     qDebug("Torrent is successfully moved from %s to %s", qPrintable(m_oldPath), qPrintable(m_newPath));
+    if (m_oldPath == m_session->torrentTempPath(hash())) {
+        qDebug() << "Removing torrent temp folder:" << m_oldPath;
+        Utils::Fs::smartRemoveEmptyFolderTree(m_oldPath);
+    }
     updateStatus();
 
     m_newPath.clear();