diff --git a/ChangeLog b/ChangeLog
index 40dedfd0d..267deb999 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,7 @@
 	* Fix #1071 issue where Deluge will fail to start if there is a stale ipc lockfile
 	* Fix autoconnecting to the next host in the list if the selected one isn't available
 	* Fix endless loop when trying to autoconnect to an offline daemon
+	* Fix exception on startup when the system tray icon is not enabled
 
 ==== Web ====
 	* Fix installing the deluge-web manpage
diff --git a/deluge/ui/gtkui/systemtray.py b/deluge/ui/gtkui/systemtray.py
index 70f8bd64c..6ccfeb332 100644
--- a/deluge/ui/gtkui/systemtray.py
+++ b/deluge/ui/gtkui/systemtray.py
@@ -165,7 +165,7 @@ class SystemTray(component.Component):
             self.tray.set_tooltip(_("Deluge\nNot Connected.."))
 
     def shutdown(self):
-        if self.config["enable_system_tray"]:        
+        if self.config["enable_system_tray"]:
             self.tray.set_visible(False)
 
     def send_status_request(self):
@@ -196,6 +196,9 @@ class SystemTray(component.Component):
         self.upload_rate = deluge.common.fsize(upload_rate)
 
     def update(self):
+        if not self.config["enable_system_tray"]:
+            return
+
         # Set the tool tip text
         max_download_speed = self.max_download_speed
         max_upload_speed = self.max_upload_speed