diff --git a/Changelog b/Changelog
index 2abb797eb..345312f77 100644
--- a/Changelog
+++ b/Changelog
@@ -3,6 +3,7 @@
     - BUGFIX: Fix sorting of ETA column when having infinite values (closes #583347)
     - BUGFIX: Torrent queue position now starts at 1 (closes #581130)
     - BUGFIX: Fix unicode issue in start seeding after torrent creation code
+    - BUGFIX: Fix torrent error state clearance on resuming
     - COSMETIC: Fix torrent properties layout
 
 * Wed May 12 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.2.7
diff --git a/src/qtorrenthandle.cpp b/src/qtorrenthandle.cpp
index dc6aaed1d..4b13806ee 100644
--- a/src/qtorrenthandle.cpp
+++ b/src/qtorrenthandle.cpp
@@ -450,7 +450,7 @@ QString QTorrentHandle::root_path() const {
 
 bool QTorrentHandle::has_error() const {
   Q_ASSERT(h.is_valid());
-  return h.status().error.empty();
+  return h.is_paused() && !h.status().error.empty();
 }
 
 void QTorrentHandle::downloading_pieces(bitfield &bf) const {