diff --git a/deluge/ui/gtkui/mainwindow.py b/deluge/ui/gtkui/mainwindow.py
index 671708529..5be1eb048 100644
--- a/deluge/ui/gtkui/mainwindow.py
+++ b/deluge/ui/gtkui/mainwindow.py
@@ -115,6 +115,7 @@ class MainWindow:
     def quit(self):
         # Stop the update timer from running
         gobject.source_remove(self.update_timer)
+        del self.systemtray
         del self.menubar
         del self.toolbar
         del self.torrentview
diff --git a/deluge/ui/gtkui/systemtray.py b/deluge/ui/gtkui/systemtray.py
index 5a6d2a418..ec7b013e7 100644
--- a/deluge/ui/gtkui/systemtray.py
+++ b/deluge/ui/gtkui/systemtray.py
@@ -45,8 +45,8 @@ class SystemTray:
         self.config = ConfigManager("gtkui.conf")
         self.config.register_set_function("enable_system_tray", 
             self.on_enable_system_tray_set)
-        if self.config["enable_system_tray"]:
-            self.enable()
+        #if self.config["enable_system_tray"]:
+        #    self.enable()
     
     def enable(self):
         """Enables the system tray icon."""