diff --git a/README.md b/README.md
index dc051fd2..0e18c811 100644
--- a/README.md
+++ b/README.md
@@ -133,6 +133,7 @@ information on what to include when reporting a bug.
  - [Win32] Bugfix: The OSMesa library was not unloaded on termination
  - [Cocoa] Bugfix: A connected Apple AirPlay would emit a useless error (#1791)
  - [Cocoa] Bugfix: The EGL and OSMesa libraries were not unloaded on termination
+ - [X11] Bugfix: The OSMesa libray was not unloaded on termination
  - [Wayland] Added support for file path drop events (#2040)
  - [Wayland] Bugfix: `glfwSetClipboardString` would fail if set to result of
    `glfwGetClipboardString`
diff --git a/src/x11_init.c b/src/x11_init.c
index 4fd9587e..8dd433f1 100644
--- a/src/x11_init.c
+++ b/src/x11_init.c
@@ -1235,6 +1235,7 @@ void _glfwPlatformTerminate(void)
         _glfw.x11.xi.handle = NULL;
     }
 
+    _glfwTerminateOSMesa();
     // NOTE: These need to be unloaded after XCloseDisplay, as they register
     //       cleanup callbacks that get called by that function
     _glfwTerminateEGL();