diff --git a/deluge/core/torrentmanager.py b/deluge/core/torrentmanager.py
index 0bfe1c1d8..c9d69f487 100644
--- a/deluge/core/torrentmanager.py
+++ b/deluge/core/torrentmanager.py
@@ -210,8 +210,11 @@ class TorrentManager(component.Component):
 
     def stop(self):
         # Stop timers
-        self.save_state_timer.stop()
-        self.save_resume_data_timer.stop()
+        if self.save_state_timer.running:
+            self.save_state_timer.stop()
+
+        if self.save_resume_data_timer.running:
+            self.save_resume_data_timer.stop()
 
         # Save state on shutdown
         self.save_state()