diff --git a/deluge/core/torrent.py b/deluge/core/torrent.py
index 9acc7526c..b18553959 100644
--- a/deluge/core/torrent.py
+++ b/deluge/core/torrent.py
@@ -93,8 +93,11 @@ class TorrentOptions(dict):
     def __getitem__(self, key):
         if super(TorrentOptions, self).has_key(key):
             return super(TorrentOptions, self).__getitem__(key)
-        elif key in self.default_keys and self.default_keys[key] in self.config:
+        elif key in self.default_keys:
+            if self.default_keys[key] in self.config:
                 return self.config[self.default_keys[key]]
+            else:
+                return self.default_keys[key]
         else:
             raise KeyError