diff --git a/deluge/core/core.py b/deluge/core/core.py
index 96932cea7..d51a17eb0 100644
--- a/deluge/core/core.py
+++ b/deluge/core/core.py
@@ -476,7 +476,7 @@ class Core(component.Component):
             return {}
 
         # Ask the plugin manager to fill in the plugin keys
-        if len(plugin_keys) > 0:
+        if len(plugin_keys) > 0 or all_keys:
             status.update(self.pluginmanager.get_status(torrent_id, plugin_keys))
         return status
 
diff --git a/deluge/core/pluginmanager.py b/deluge/core/pluginmanager.py
index 1c51dbc99..7b89394fa 100644
--- a/deluge/core/pluginmanager.py
+++ b/deluge/core/pluginmanager.py
@@ -66,6 +66,8 @@ class PluginManager(deluge.pluginmanagerbase.PluginManagerBase, component.Compon
     def get_status(self, torrent_id, fields):
         """Return the value of status fields for the selected torrent_id."""
         status = {}
+        if len(fields) == 0:
+            fields = self.status_fields.keys()
         for field in fields:
             try:
                 status[field] = self.status_fields[field](torrent_id)