diff --git a/TODO b/TODO
index 253d5e1ea..d0a4c9132 100644
--- a/TODO
+++ b/TODO
@@ -57,6 +57,5 @@ rc8->final? changelog:
 - BUGFIX: Remember properties window size and position
 - BUGFIX: Improved proxy support in search engine (HTTP only)
 - BUGFIX: Do no pause torrents before saving fastresume data anymore (no longer needed)
-- BUGFIX: Save fast resume data regularly (every 10 seconds) to avoid downloading from s
-cratch if qBittorrent crashes
-
+- BUGFIX: Save fast resume data regularly (every 10 seconds) to avoid downloading from scratch if qBittorrent crashes
+- BUGFIX: Do not save fastresume data for checking torrents anymore
diff --git a/src/bittorrent.cpp b/src/bittorrent.cpp
index 21d8aef2c..e28eccfe9 100644
--- a/src/bittorrent.cpp
+++ b/src/bittorrent.cpp
@@ -845,7 +845,7 @@ void bittorrent::saveFastResumeAndRatioData() {
     }
     QString hash = h.hash();
     // Extracting resume data
-    if (h.has_metadata()) {
+    if (h.has_metadata() && h.state() != torrent_status::checking_files && h.state() != torrent_status::queued_for_checking) {
       if(QFile::exists(torrentBackup.path()+QDir::separator()+hash+".torrent")) {
         // Remove old .fastresume data in case it exists
         QFile::remove(torrentBackup.path()+QDir::separator()+hash + ".fastresume");