diff --git a/common/headless_view.cpp b/common/headless_view.cpp
index 3fb090f2b..f771be302 100644
--- a/common/headless_view.cpp
+++ b/common/headless_view.cpp
@@ -151,6 +151,12 @@ HeadlessView::~HeadlessView() {
 #if MBGL_USE_CGL
     CGLDestroyContext(gl_context);
 #endif
+
+#if MBGL_USE_GLX
+    glXDestroyContext(x_display, gl_context);
+    XFree(x_info);
+    XCloseDisplay(x_display);
+#endif
 }
 
 void HeadlessView::notify_map_change(mbgl::MapChange /*change*/, mbgl::timestamp /*delay*/) {