diff --git a/Changelog b/Changelog
index debefdca7..7f7ba942c 100644
--- a/Changelog
+++ b/Changelog
@@ -2,6 +2,7 @@
     - BUGFIX: Fix possible crash when adding a torrent
     - BUGFIX: Fix torrent addition window layout (torrent content not expanding)
     - BUGFIX: Fix about dialog in Web UI
+    - BUGFIX: Correctly clear trackers error messages once they work
 
 * Sun Apr 04 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.2.3
     - BUGFIX: Fix possible crash when deleting a torrent just after pausing it
diff --git a/src/trackerlist.h b/src/trackerlist.h
index 033d17c81..ee376fa7d 100644
--- a/src/trackerlist.h
+++ b/src/trackerlist.h
@@ -263,29 +263,36 @@ public slots:
 #ifdef LIBTORRENT_0_15
       if(it->verified) {
         item->setText(COL_STATUS, tr("Working"));
+        item->setText(COL_MSG, "");
       } else {
         if(it->updating && it->fails == 0) {
           item->setText(COL_STATUS, tr("Updating..."));
+          item->setText(COL_MSG, "");
         } else {
           if(it->fails > 0) {
             item->setText(COL_STATUS, tr("Not working"));
+            item->setText(COL_MSG, error_message);
           } else {
             item->setText(COL_STATUS, tr("Not contacted yet"));
+            item->setText(COL_MSG, "");
           }
         }
       }
 #else
       if(data.verified) {
         item->setText(COL_STATUS, tr("Working"));
+        item->setText(COL_MSG, "");
       } else {
-        if(data.fail_count > 0)
+        if(data.fail_count > 0) {
           item->setText(COL_STATUS, tr("Not working"));
-        else
+          item->setText(COL_MSG, error_message);
+        } else {
           item->setText(COL_STATUS, tr("Not contacted yet"));
+          item->setText(COL_MSG, "");
+        }
       }
 #endif
       item->setText(COL_PEERS, QString::number(trackers_data.value(tracker_url, TrackerInfos(tracker_url)).num_peers));
-      item->setText(COL_MSG, error_message);
     }
     // Remove old trackers
     foreach(const QString &tracker, old_trackers_urls) {