diff --git a/src/bittorrent.cpp b/src/bittorrent.cpp
index 669bfb4f1..4c0ea64f6 100644
--- a/src/bittorrent.cpp
+++ b/src/bittorrent.cpp
@@ -84,8 +84,10 @@ void bittorrent::updateETAs(){
       }else{
         torrent_status torrentStatus = h.status();
         torrent_info ti = h.get_torrent_info();
-        listEtas << (long)((ti.total_size()-torrentStatus.total_done)/(double)torrentStatus.download_payload_rate);
-        ETAstats[hash] = listEtas;
+        if(torrentStatus.download_payload_rate != 0){
+          listEtas << (long)((ti.total_size()-torrentStatus.total_done)/(double)torrentStatus.download_payload_rate);
+          ETAstats[hash] = listEtas;
+        }
       }
     }
   }