diff --git a/TODO b/TODO
index d28936203..446fc90b8 100644
--- a/TODO
+++ b/TODO
@@ -46,7 +46,7 @@
 - update sorting when a new torrent is added?
 - Keep documention up to date
 - Windows port (Chris - Peerkoel)
-- write a patch for file_priority(int index), actual_size();
+- write patches libtorrent for file_priority(int index), actual_size() ?
 - valgrind --tool=memcheck --leak-check=full src/qbittorrent (Looks ok)
 - 129m  30m  16m S  5.8  3.0   0:04.36 qbittorrent
 * beta 6
@@ -90,5 +90,5 @@ beta5->beta6 changelog:
 - BUGFIX: ETA was wrong for torrents with filtered files
 - BUGFIX: Display the torrent that are being checked as 'checking' in seeding list
 - BUGFIX: Fixed file preview and improved previewable files detection
-- BUGFIX: Do not store and calculate ETA values for finished torrents
+- BUGFIX: Do not store and calculate ETA values for finished/paused torrents
 - I18N: Removed no longer maintained Traditional chinese translation
\ No newline at end of file
diff --git a/src/bittorrent.cpp b/src/bittorrent.cpp
index 3bee5a7e4..2674e2ebf 100644
--- a/src/bittorrent.cpp
+++ b/src/bittorrent.cpp
@@ -109,6 +109,7 @@ void bittorrent::updateETAs() {
   foreach(hash, unfinishedTorrents) {
     QTorrentHandle h = getTorrentHandle(hash);
     if(h.is_valid()) {
+      if(h.is_paused()) continue;
       QString hash = h.hash();
       QList<qlonglong> listEtas = ETAstats.value(hash, QList<qlonglong>());
       if(listEtas.size() == ETAS_MAX_VALUES) {
@@ -272,6 +273,9 @@ bool bittorrent::pauseTorrent(QString hash) {
     paused_file.open(QIODevice::WriteOnly | QIODevice::Text);
     paused_file.close();
   }
+  // Remove it from ETAs hash tables
+  ETAstats.remove(hash);
+  ETAs.remove(hash);
   return change;
 }