diff --git a/source/de/anomic/plasma/plasmaSwitchboard.java b/source/de/anomic/plasma/plasmaSwitchboard.java
index 9da3c57d5..00217b310 100644
--- a/source/de/anomic/plasma/plasmaSwitchboard.java
+++ b/source/de/anomic/plasma/plasmaSwitchboard.java
@@ -834,20 +834,20 @@ public final class plasmaSwitchboard extends serverAbstractSwitch<IndexingStack.
         setLog(new serverLog("PLASMA"));
         if (applyPro) this.log.logInfo("This is the pro-version of YaCy");
         
-        // make system tray
-        try {
-        	final boolean trayIcon = getConfig("trayIcon", "false").equals("true");
-        	if (trayIcon) {
-				System.setProperty("java.awt.headless", "false");
-				yacytray = new yacyTray(this, false);
-			}
-		} catch (Exception e) {
-			try{
-				yacytray.removeTray();
-			} finally {
-				System.setProperty("java.awt.headless", "true");
-			}
-		}
+        // make system tray TODO: enable
+//        try {
+//        	final boolean trayIcon = getConfig("trayIcon", "false").equals("true");
+//        	if (trayIcon) {
+//				System.setProperty("java.awt.headless", "false");
+//				yacytray = new yacyTray(this, false);
+//			}
+//		} catch (Exception e) {
+//			try{
+//				yacytray.removeTray();
+//			} finally {
+//				System.setProperty("java.awt.headless", "true");
+//			}
+//		}
 		        
         // remote proxy configuration
         httpdProxyHandler.setRemoteProxyConfig(httpRemoteProxyConfig.init(this)); // TODO refactoring
@@ -1659,7 +1659,7 @@ public final class plasmaSwitchboard extends serverAbstractSwitch<IndexingStack.
         crawlQueues.close();
         log.logConfig("SWITCHBOARD SHUTDOWN STEP 3: sending termination signal to database manager (stand by...)");
         webIndex.close();
-        if(System.getProperty("java.awt.headless") == "false") yacytray.removeTray();
+//        if(System.getProperty("java.awt.headless") == "false") yacytray.removeTray(); TODO: enable
         log.logConfig("SWITCHBOARD SHUTDOWN TERMINATED");
     }