diff --git a/Changelog b/Changelog
index 72aa24753..ac07d76be 100644
--- a/Changelog
+++ b/Changelog
@@ -1,5 +1,6 @@
 * Unreleased - Christophe Dumez <chris@qbittorrent.org> - v2.0.2
     - BUGFIX: Fix RSS Feed downloader for some feeds
+    - BUGFIX: Do not use home folder as a fallback when the save path is not accessible
 
 * Sun Dec 13 2009 - Christophe Dumez <chris@qbittorrent.org> - v2.0.1
     - BUGFIX: µTorrent user-agent is now spoofed correctly
diff --git a/src/bittorrent.cpp b/src/bittorrent.cpp
index b50f2ba84..19d4abd74 100644
--- a/src/bittorrent.cpp
+++ b/src/bittorrent.cpp
@@ -1671,7 +1671,7 @@ QString Bittorrent::getSavePath(QString hash) {
     if(!saveDir.mkpath(saveDir.path())) {
       std::cerr << "Couldn't create the save directory: " << saveDir.path().toLocal8Bit().data() << "\n";
       // XXX: handle this better
-      return QDir::homePath();
+      //return QDir::homePath();
     }
   }
   return savePath;