diff --git a/deluge/core/torrentmanager.py b/deluge/core/torrentmanager.py
index 7ab433d00..3dd316cb1 100644
--- a/deluge/core/torrentmanager.py
+++ b/deluge/core/torrentmanager.py
@@ -989,7 +989,6 @@ class TorrentManager(component.Component):
             torrent_id = str(alert.handle.info_hash())
         except:
             return
-        torrent.is_finished = torrent.handle.is_seed()
         old_state = torrent.state
         torrent.update_state()
         if torrent.state != old_state:
@@ -1009,7 +1008,7 @@ class TorrentManager(component.Component):
         torrent.update_state()
 
         # Torrent may need to download data after checking.
-        if torrent.state == 'Checking':
+        if torrent.state in ('Checking', 'Checking Resume Data', 'Downloading'):
             torrent.is_finished = False
 
         # Only emit a state changed event if the state has actually changed