diff --git a/src/glx_context.c b/src/glx_context.c
index a2464a9d..15ca4f9d 100644
--- a/src/glx_context.c
+++ b/src/glx_context.c
@@ -222,6 +222,11 @@ static int extensionSupportedGLX(const char* extension)
 
 static GLFWglproc getProcAddressGLX(const char* procname)
 {
+    // Avoid calling glXGetProcAddress() for EGL procs.
+    // We don't expect it to ever succeed, but somtimes it returns non-null anyway.
+    if (0 == strncmp(procname, "egl", 3)) {
+        return NULL;
+    }
     if (_glfw.glx.GetProcAddress)
         return _glfw.glx.GetProcAddress((const GLubyte*) procname);
     else if (_glfw.glx.GetProcAddressARB)