diff --git a/src/bittorrent.cpp b/src/bittorrent.cpp
index f74afa16b..dcff27616 100644
--- a/src/bittorrent.cpp
+++ b/src/bittorrent.cpp
@@ -787,7 +787,7 @@ void bittorrent::saveFastResumeData() {
   std::vector<torrent_handle>::iterator torrentIT;
   for(torrentIT = torrents.begin(); torrentIT != torrents.end(); torrentIT++) {
     QTorrentHandle h = QTorrentHandle(*torrentIT);
-    if(!h.is_valid() || !h.has_metadata()) continue;
+    if(!h.is_valid() || !h.has_metadata() || h.is_paused()) continue;
     if(h.state() == torrent_status::checking_files || h.state() == torrent_status::queued_for_checking) continue;
     h.save_resume_data();
     ++num_resume_data;
diff --git a/src/qtorrenthandle.cpp b/src/qtorrenthandle.cpp
index b3044105c..fba68471d 100644
--- a/src/qtorrenthandle.cpp
+++ b/src/qtorrenthandle.cpp
@@ -319,6 +319,7 @@ void QTorrentHandle::pause() {
   Q_ASSERT(h.is_valid());
   h.auto_managed(false);
   h.pause();
+  h.save_resume_data();
 }
 
 void QTorrentHandle::resume() {