diff --git a/build/linux/dist/arduino b/build/linux/dist/arduino
index e65183157..79228a774 100755
--- a/build/linux/dist/arduino
+++ b/build/linux/dist/arduino
@@ -26,5 +26,7 @@ else
 	SPLASH="-splash:./lib/splash.png"
 fi
 
+export JAVA_TOOL_OPTIONS=`echo $JAVA_TOOL_OPTIONS | sed 's|-javaagent:/usr/share/java/jayatanaag.jar||g'`
+
 java -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel $SPLASH ArduinoIDE --curdir $CURDIR "$@"