diff --git a/Launcher/src/main/java/pro/gravit/launcher/client/ClientLauncherProcess.java b/Launcher/src/main/java/pro/gravit/launcher/client/ClientLauncherProcess.java
index a224e176..7352126b 100644
--- a/Launcher/src/main/java/pro/gravit/launcher/client/ClientLauncherProcess.java
+++ b/Launcher/src/main/java/pro/gravit/launcher/client/ClientLauncherProcess.java
@@ -171,6 +171,14 @@ public void start(boolean pipeOutput) throws IOException, InterruptedException {
             LogHelper.debug("Commandline: %s", Arrays.toString(processArgs.toArray()));
         ProcessBuilder processBuilder = new ProcessBuilder(processArgs);
         EnvHelper.addEnv(processBuilder);
+        if(JVMHelper.OS_TYPE == JVMHelper.OS.LINUX){
+            var env = processBuilder.environment();
+            // https://github.com/Admicos/minecraft-wayland/issues/55
+            env.put("__GL_THREADED_OPTIMIZATIONS", "0");
+            if(params.lwjglGlfwWayland) {
+                env.remove("DISPLAY"); // No X11
+            }
+        }
         processBuilder.environment().put("JAVA_HOME", javaVersion.jvmDir.toAbsolutePath().toString());
         processBuilder.environment().putAll(systemEnv);
         processBuilder.directory(workDir.toFile());
diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/ClientProfile.java b/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/ClientProfile.java
index 7e963040..681ba5b4 100644
--- a/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/ClientProfile.java
+++ b/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/ClientProfile.java
@@ -466,7 +466,7 @@ public enum ClassLoaderConfig {
     }
 
     public enum CompatibilityFlags {
-        LEGACY_NATIVES_DIR, CLASS_CONTROL_API, ENABLE_HACKS
+        LEGACY_NATIVES_DIR, CLASS_CONTROL_API, ENABLE_HACKS, WAYLAND_USE_CUSTOM_GLFW
     }
 
     public static class Version implements Comparable<Version> {
diff --git a/LauncherClient/src/main/java/pro/gravit/launcher/client/ClientLauncherEntryPoint.java b/LauncherClient/src/main/java/pro/gravit/launcher/client/ClientLauncherEntryPoint.java
index 167a542e..b90f7958 100644
--- a/LauncherClient/src/main/java/pro/gravit/launcher/client/ClientLauncherEntryPoint.java
+++ b/LauncherClient/src/main/java/pro/gravit/launcher/client/ClientLauncherEntryPoint.java
@@ -176,9 +176,9 @@ private static void realMain(String[] args) throws Throwable {
         if(profile.hasFlag(ClientProfile.CompatibilityFlags.CLASS_CONTROL_API)) {
             ClientService.classLoaderControl = classLoaderControl;
         }
-        if(params.lwjglGlfwWayland) {
-            String glfwPath = ClientService.findLibrary("glfw_wayland");
-            System.setProperty("org.lwjgl.glfw.libname", glfwPath);
+        if(params.lwjglGlfwWayland && profile.hasFlag(ClientProfile.CompatibilityFlags.WAYLAND_USE_CUSTOM_GLFW)) {
+            String glfwName = ClientService.findLibrary("glfw_wayland");
+            System.setProperty("org.lwjgl.glfw.libname", glfwName);
         }
         AuthService.projectName = Launcher.getConfig().projectName;
         AuthService.username = params.playerProfile.username;