diff --git a/src/config.py b/src/config.py
index bb30a60f3d8ec41e050f20b9b959418a49d8dd27..3d999f68926ff64d5801597f8f3d9e71c224b769 100644
--- a/src/config.py
+++ b/src/config.py
@@ -314,6 +314,8 @@ class PreferencesWindow:
 			systray_combobox.set_active(1)
 		else:
 			systray_combobox.set_active(2)
+		if not gajim.interface.systray_capabilities:
+			systray_combobox.set_sensitive(False)
 
 		# sounds
 		if gajim.config.get('sounds_on'):
diff --git a/src/gajim.py b/src/gajim.py
index 5eb571592c0734c0263068a7cae93320a91401c6..3dd191d37776e33b3918268e89ecd412acddff07 100644
--- a/src/gajim.py
+++ b/src/gajim.py
@@ -3609,6 +3609,8 @@ class Interface:
 			self.systray_capabilities = systray.HAS_SYSTRAY_CAPABILITIES
 			if self.systray_capabilities:
 				self.systray = systray.Systray()
+			else:
+				gajim.config.set('trayicon', 'never')
 
 		path_to_file = os.path.join(gajim.DATA_DIR, 'pixmaps', 'gajim.png')
 		pix = gtk.gdk.pixbuf_new_from_file(path_to_file)