diff --git a/linux_various/PCSX2-linux.sh b/linux_various/PCSX2-linux.sh
index 9268b49030..b99c8dc56c 100755
--- a/linux_various/PCSX2-linux.sh
+++ b/linux_various/PCSX2-linux.sh
@@ -72,4 +72,4 @@ then
 fi
 
 # And finally launch me
-GDK_BACKEND=x11 LD_LIBRARY_PATH="$MY_LD_LIBRARY_PATH" __GL_THREADED_OPTIMIZATIONS=1 $DIR/PCSX2 "$@"
+GDK_BACKEND=x11 LD_LIBRARY_PATH="$MY_LD_LIBRARY_PATH" __GL_THREADED_OPTIMIZATIONS=1 mesa_glthread=true MESA_NO_ERROR=1 $DIR/PCSX2 "$@"
diff --git a/linux_various/PCSX2.desktop.in b/linux_various/PCSX2.desktop.in
index 15e1140085..d97c03625f 100644
--- a/linux_various/PCSX2.desktop.in
+++ b/linux_various/PCSX2.desktop.in
@@ -8,7 +8,7 @@ GenericName[zh_CN]=PlayStation 2 模拟器
 Comment=Sony PlayStation 2 emulator
 Comment[ru]=Эмулятор Sony PlayStation 2
 Comment[zh_CN]=索尼 PlayStation 2 模拟器
-Exec=env GDK_BACKEND=x11 __GL_THREADED_OPTIMIZATIONS=1 PCSX2
+Exec=env GDK_BACKEND=x11 __GL_THREADED_OPTIMIZATIONS=1 mesa_glthread=true MESA_NO_ERROR=1 PCSX2
 Icon=PCSX2
 Keywords=game;emulator;
 Categories=@PCSX2_MENU_CATEGORIES@