diff --git a/src/Tor/TorManager.py b/src/Tor/TorManager.py
index fafe51eb..52efff0a 100644
--- a/src/Tor/TorManager.py
+++ b/src/Tor/TorManager.py
@@ -72,7 +72,8 @@ class TorManager(object):
                 # Change to self-bundled Tor ports
                 self.port = 49051
                 self.proxy_port = 49050
-                socks.setdefaultproxy(socks.PROXY_TYPE_SOCKS5, "127.0.0.1", self.proxy_port)
+                if config.tor == "always":
+                    socks.setdefaultproxy(socks.PROXY_TYPE_SOCKS5, "127.0.0.1", self.proxy_port)
                 self.enabled = True
                 if not self.connect():
                     self.startTor()