diff --git a/Changelog b/Changelog
index 8715ae7b3..45a22e39c 100644
--- a/Changelog
+++ b/Changelog
@@ -5,6 +5,7 @@
   - BUGFIX: Improve folder removal behavior
   - BUGFIX: Make sure the .unwanted folder is deleted on soft torrent removal
   - BUGFIX: Indicate support for Magnet links in desktop file (Fisiu)
+  - BUGFIX: Do not report torrent being checked as queued
 
 * Sat Feb 26 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.6.7
   - BUGFIX: Encoding fixes (Windows)
diff --git a/src/qtlibtorrent/torrentmodel.cpp b/src/qtlibtorrent/torrentmodel.cpp
index a9ce25bfd..f9e7ccd08 100644
--- a/src/qtlibtorrent/torrentmodel.cpp
+++ b/src/qtlibtorrent/torrentmodel.cpp
@@ -57,9 +57,13 @@ TorrentModelItem::State TorrentModelItem::state() const
       return m_torrent.is_seed() ? STATE_PAUSED_UP : STATE_PAUSED_DL;
     }
     if(m_torrent.is_queued()) {
-      m_icon = QIcon(":/Icons/skin/queued.png");
-      m_fgColor = QColor("grey");
-      return m_torrent.is_seed() ? STATE_QUEUED_UP : STATE_QUEUED_DL;
+      if(m_torrent.state() != torrent_status::queued_for_checking
+          && m_torrent.state() != torrent_status::checking_resume_data
+          && m_torrent.state() != torrent_status::checking_files) {
+        m_icon = QIcon(":/Icons/skin/queued.png");
+        m_fgColor = QColor("grey");
+        return m_torrent.is_seed() ? STATE_QUEUED_UP : STATE_QUEUED_DL;
+      }
     }
     // Other states
     switch(m_torrent.state()) {