diff --git a/deluge/core/torrent.py b/deluge/core/torrent.py
index 08c2e76a4..c8ad79109 100644
--- a/deluge/core/torrent.py
+++ b/deluge/core/torrent.py
@@ -246,7 +246,6 @@ class Torrent(object):
         self.forced_error = None
         self.statusmsg = None
         self.state = None
-        self.moving_storage = False
         self.moving_storage_dest_path = None
         self.tracker_status = ''
         self.tracker_host = None
@@ -614,7 +613,7 @@ class Torrent(object):
             # auto-manage status will be reverted upon resuming.
             self.handle.auto_managed(False)
             self.set_status_message(decode_string(status_error))
-        elif self.moving_storage:
+        elif status.moving_storage:
             self.state = 'Moving'
         elif not session_paused and status.paused and status.auto_managed:
             self.state = 'Queued'
@@ -881,7 +880,7 @@ class Torrent(object):
 
         if self.state == 'Error':
             progress = 100.0
-        elif self.moving_storage:
+        elif self.state == 'Moving':
             # Check if torrent has downloaded any data yet.
             if self.status.total_done:
                 torrent_files = [f['path'] for f in self.get_files()]
@@ -1125,7 +1124,6 @@ class Torrent(object):
         except RuntimeError as ex:
             log.error('Error calling libtorrent move_storage: %s', ex)
             return False
-        self.moving_storage = True
         self.moving_storage_dest_path = dest
         self.update_state()
         return True
diff --git a/deluge/core/torrentmanager.py b/deluge/core/torrentmanager.py
index 12e2c7cc2..af9590ea5 100644
--- a/deluge/core/torrentmanager.py
+++ b/deluge/core/torrentmanager.py
@@ -1062,7 +1062,6 @@ class TorrentManager(component.Component):
 
         torrent.set_download_location(os.path.normpath(alert.storage_path))
         torrent.set_move_completed(False)
-        torrent.moving_storage = False
         torrent.update_state()
 
         if torrent_id in self.waiting_on_finish_moving:
@@ -1081,7 +1080,6 @@ class TorrentManager(component.Component):
         log.warning('on_alert_storage_moved_failed: %s', decode_string(alert.message()))
         # Set an Error message and pause the torrent
         alert_msg = decode_string(alert.message()).split(':', 1)[1].strip()
-        torrent.moving_storage = False
         torrent.force_error_state('Failed to move download folder: %s' % alert_msg)
 
         if torrent_id in self.waiting_on_finish_moving: