diff --git a/ChangeLog b/ChangeLog
index 1e7272965..b54c679b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
 === Deluge 1.1.7 - (In Development) ===
+==== Core ====
+  * Fix issue where cannot resume torrent after doing a 'Pause All'
+  
 ==== GtkUI ====
   * Fix #883 segfault if locale is not using UTF-8 encoding
   * Fix for adding torrents with invalid filename encodings
diff --git a/deluge/core/core.py b/deluge/core/core.py
index 0b724189d..9c0ce2c08 100644
--- a/deluge/core/core.py
+++ b/deluge/core/core.py
@@ -519,11 +519,13 @@ class Core(
 
     def export_pause_all_torrents(self):
         """Pause all torrents in the session"""
-        self.session.pause()
+        for torrent in self.torrentmanager.torrents.values():
+            torrent.pause()
 
     def export_resume_all_torrents(self):
         """Resume all torrents in the session"""
-        self.session.resume()
+        for torrent in self.torrentmanager.torrents.values():
+            torrent.resume()
         self.signals.emit("torrent_all_resumed")
 
     def export_resume_torrent(self, torrent_ids):