diff --git a/src/FinishedTorrents.cpp b/src/FinishedTorrents.cpp
index 0e66f203b..8ce848ada 100644
--- a/src/FinishedTorrents.cpp
+++ b/src/FinishedTorrents.cpp
@@ -236,6 +236,7 @@ void FinishedTorrents::updateTorrent(QTorrentHandle h) {
       row = getRowFromHash(hash);
     }
     Q_ASSERT(row != -1);
+    if(h.is_paused()) return;
     // Update queued torrent
     if(BTSession->isQueueingEnabled() && h.is_queued()) {
         if(h.state() == torrent_status::checking_files || h.state() == torrent_status::queued_for_checking){
@@ -249,7 +250,6 @@ void FinishedTorrents::updateTorrent(QTorrentHandle h) {
         setRowColor(row, QString::fromUtf8("grey"));
         return;
     }
-    if(h.is_paused()) return;
     if(h.state() == torrent_status::checking_files || h.state() == torrent_status::queued_for_checking){
       finishedListModel->setData(finishedListModel->index(row, F_NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/time.png"))), Qt::DecorationRole);
       setRowColor(row, QString::fromUtf8("grey"));
diff --git a/src/downloadingTorrents.cpp b/src/downloadingTorrents.cpp
index f7c66e6db..0577a85d1 100644
--- a/src/downloadingTorrents.cpp
+++ b/src/downloadingTorrents.cpp
@@ -496,6 +496,8 @@ bool DownloadingTorrents::updateTorrent(QTorrentHandle h) {
         added = true;
       }
       Q_ASSERT(row != -1);
+      // No need to update a paused torrent
+      if(h.is_paused()) return added;
       // Update Priority
       if(BTSession->isQueueingEnabled()) {
           DLListModel->setData(DLListModel->index(row, PRIORITY), QVariant((int)BTSession->getDlTorrentPriority(hash)));
@@ -519,8 +521,6 @@ bool DownloadingTorrents::updateTorrent(QTorrentHandle h) {
               return added;
           }
       }
-      // No need to update a paused torrent
-      if(h.is_paused()) return added;
       // Parse download state
       // Setting download state
       switch(h.state()) {